1
0
mirror of https://github.com/anope/anope.git synced 2026-07-09 02:43:13 +02:00

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

This commit is contained in:
Adam
2013-05-08 09:50:43 -04:00
parent 6859decfb8
commit 9b07e163c0
16 changed files with 212 additions and 244 deletions
+4 -15
View File
@@ -446,22 +446,11 @@ class CommandOSDNS : public Command
return;
}
sockaddrs addr;
try
sockaddrs addr(params[2]);
if (!addr.valid())
{
addr.pton(AF_INET, params[2]);
}
catch (const SocketException &)
{
try
{
addr.pton(AF_INET6, params[2]);
}
catch (const SocketException &)
{
source.Reply(_("%s is not a valid IP address."), params[2].c_str());
return;
}
source.Reply(_("%s is not a valid IP address."), params[2].c_str());
return;
}
s->GetIPs().push_back(params[2]);