mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-10 02:59:01 -04:00
Increase static buffer size to 44 to account for a full IPv6 CIDR mask: 1111:1111:1111:1111:1111:1111:1111:1111/128 + null terminator. Also remove newlines in returned mask.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9984 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
parent
3573a074cf
commit
ab348e6c8b
@ -1103,7 +1103,7 @@ int User::GetProtocolFamily()
|
||||
|
||||
const char* User::GetCIDRMask(int range)
|
||||
{
|
||||
static char buf[40];
|
||||
static char buf[44];
|
||||
|
||||
if (this->ip == NULL)
|
||||
return "";
|
||||
@ -1162,7 +1162,7 @@ const char* User::GetCIDRMask(int range)
|
||||
/* And finally, zero the extra bits required. */
|
||||
v6.s6_addr[15 - bytestozero] = (v6.s6_addr[15 - bytestozero] >> extrabits) << extrabits;
|
||||
|
||||
sprintf(buf, "%s/%d\n", inet_ntop(AF_INET6, &v6, buffer, 40), range);
|
||||
sprintf(buf, "%s/%d", inet_ntop(AF_INET6, &v6, buffer, 40), range);
|
||||
return buf;
|
||||
}
|
||||
break;
|
||||
@ -1197,7 +1197,7 @@ const char* User::GetCIDRMask(int range)
|
||||
v4.s_addr = 0;
|
||||
}
|
||||
|
||||
sprintf(buf, "%s/%d\n", inet_ntop(AF_INET, &v4, buffer, 16), range);
|
||||
sprintf(buf, "%s/%d", inet_ntop(AF_INET, &v4, buffer, 16), range);
|
||||
return buf;
|
||||
}
|
||||
break;
|
||||
|
Loading…
x
Reference in New Issue
Block a user