mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-14 08:50:53 +00:00
Merge branch 'ban-64-bitmask' into 'next'
Ban by /64 by default instead of /128 See merge request STJr/SRB2!2534
This commit is contained in:
commit
1b66373a4a
1 changed files with 3 additions and 3 deletions
|
@ -1208,7 +1208,7 @@ static boolean SOCK_Ban(INT32 node)
|
||||||
else if (banned[numbans].any.sa_family == AF_INET6)
|
else if (banned[numbans].any.sa_family == AF_INET6)
|
||||||
{
|
{
|
||||||
banned[numbans].ip6.sin6_port = 0;
|
banned[numbans].ip6.sin6_port = 0;
|
||||||
bannedmask[numbans] = 128;
|
bannedmask[numbans] = 64;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
numbans++;
|
numbans++;
|
||||||
|
@ -1245,7 +1245,7 @@ static boolean SOCK_SetBanAddress(const char *address, const char *mask)
|
||||||
bannedmask[numbans] = (UINT8)atoi(mask);
|
bannedmask[numbans] = (UINT8)atoi(mask);
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
else if (runp->ai_family == AF_INET6)
|
else if (runp->ai_family == AF_INET6)
|
||||||
bannedmask[numbans] = 128;
|
bannedmask[numbans] = 64;
|
||||||
#endif
|
#endif
|
||||||
else
|
else
|
||||||
bannedmask[numbans] = 32;
|
bannedmask[numbans] = 32;
|
||||||
|
@ -1254,7 +1254,7 @@ static boolean SOCK_SetBanAddress(const char *address, const char *mask)
|
||||||
bannedmask[numbans] = 32;
|
bannedmask[numbans] = 32;
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
else if (bannedmask[numbans] > 128 && runp->ai_family == AF_INET6)
|
else if (bannedmask[numbans] > 128 && runp->ai_family == AF_INET6)
|
||||||
bannedmask[numbans] = 128;
|
bannedmask[numbans] = 64;
|
||||||
#endif
|
#endif
|
||||||
numbans++;
|
numbans++;
|
||||||
runp = runp->ai_next;
|
runp = runp->ai_next;
|
||||||
|
|
Loading…
Reference in a new issue