Make sockaddrs/cidr not throw on invalid ips to give us an easier/cheaper way to test for a valid IP

1 files changed, 2 insertions, 7 deletions

diff --git a/modules/m_dnsbl.cpp b/modules/m_dnsbl.cpp
index ea1f1d9f6..08d4e365d 100644
--- a/modules/m_dnsbl.cpp
+++ b/modules/m_dnsbl.cpp
@@ -134,15 +134,10 @@ class ModuleDNSBL : public Module
 
 		/* At this time we only support IPv4 */
 		sockaddrs user_ip;
-		try
-		{
-			user_ip.pton(AF_INET, user->ip);
-		}
-		catch (const SocketException &)
-		{
+		user_ip.pton(AF_INET, user->ip);
+		if (!user_ip.valid())
 			/* User doesn't have a valid IPv4 IP (ipv6/spoof/etc) */
 			return;
-		}
 
 		const unsigned long &ip = user_ip.sa4.sin_addr.s_addr;
 		unsigned long reverse_ip = (ip << 24) | ((ip & 0xFF00) << 8) | ((ip & 0xFF0000) >> 8) | (ip >> 24);