pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-29 06:56:39 +02:00
Code Activity

Removed this "valid" ip check in cidr::cidr, is wrong for IPv6 and ::pton checks this anyway using inet_pton. Also fixed a comment Robby broke in chanserv.conf

Browse Source
This commit is contained in:
Adam
2012-01-10 17:53:48 -05:00
parent 1e9d88af01
commit 7c03e60299
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sockets.cpp
+5 -7
View File
@@ -122,9 +122,9 @@ void sockaddrs::pton(int type, const Anope::string &address, int pport)
{
int i = inet_pton(type, address.c_str(), &sa4.sin_addr);
if (i == 0)
throw SocketException("Invalid host");
throw SocketException("Invalid IP");
else if (i <= -1)
throw SocketException("Invalid host: " + Anope::LastError());
throw SocketException("Invalid IP: " + Anope::LastError());
sa4.sin_family = type;
sa4.sin_port = htons(pport);
return;
@@ -133,9 +133,9 @@ void sockaddrs::pton(int type, const Anope::string &address, int pport)
{
int i = inet_pton(type, address.c_str(), &sa6.sin6_addr);
if (i == 0)
throw SocketException("Invalid host");
throw SocketException("Invalid IP");
else if (i <= -1)
throw SocketException("Invalid host: " + Anope::LastError());
throw SocketException("Invalid IP: " + Anope::LastError());
sa6.sin6_family = type;
sa6.sin6_port = htons(pport);
return;
@@ -173,11 +173,9 @@ void sockaddrs::ntop(int type, const void *src)
cidr::cidr(const Anope::string &ip)
{
if (ip.find_first_not_of("01234567890:./") != Anope::string::npos)
throw SocketException("Invalid IP");
bool ipv6 = ip.find(':') != Anope::string::npos;
size_t sl = ip.find_last_of('/');
if (sl == Anope::string::npos)
{
this->cidr_ip = ip;