stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-28 04:00:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Combine banned & bannedmask into banned_t

Browse source 
Better code cleanliness, also makes it easier to add more data to bans later (such as a timestamp for temporary bans)

# Conflicts:
#	src/i_tcp.c
This commit is contained in:
toaster 2022-06-14 16:48:29 +01:00
parent 77e67d86bc
commit 2f0e1521d0
1 changed files with 39 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/i_tcp.c
View file

@ -230,6 +230,14 @@ typedef int socklen_t;
#endif #endif
#ifndef NONET #ifndef NONET
typedef struct
{
mysockaddr_t address;
UINT8 mask;
// TODO: timestamp, for tempbans!
} banned_t;
static SOCKET_TYPE mysockets[MAXNETNODES+1] = {ERRSOCKET}; static SOCKET_TYPE mysockets[MAXNETNODES+1] = {ERRSOCKET};
static size_t mysocketses = 0; static size_t mysocketses = 0;
static int myfamily[MAXNETNODES+1] = {0}; static int myfamily[MAXNETNODES+1] = {0};
@ -238,8 +246,7 @@ static mysockaddr_t clientaddress[MAXNETNODES+1];
static mysockaddr_t broadcastaddress[MAXNETNODES+1]; static mysockaddr_t broadcastaddress[MAXNETNODES+1];
static size_t broadcastaddresses = 0; static size_t broadcastaddresses = 0;
static boolean nodeconnected[MAXNETNODES+1]; static boolean nodeconnected[MAXNETNODES+1];
static mysockaddr_t *banned; static banned_t *banned;
static UINT8 *bannedmask;
#endif #endif
static size_t numbans = 0; static size_t numbans = 0;
@ -473,7 +480,7 @@ static const char *SOCK_GetBanAddress(size_t ban)
#ifdef NONET #ifdef NONET
return NULL; return NULL;
#else #else
return SOCK_AddrToStr(&banned[ban]); return SOCK_AddrToStr(&banned[ban].address);
#endif #endif
} }
@ -485,7 +492,7 @@ static const char *SOCK_GetBanMask(size_t ban)
static char s[16]; //255.255.255.255 netmask? no, just CDIR for only static char s[16]; //255.255.255.255 netmask? no, just CDIR for only
if (ban >= numbans) if (ban >= numbans)
return NULL; return NULL;
if (sprintf(s,"%d",bannedmask[ban]) > 0) if (sprintf(s,"%d",banned[ban].mask) > 0)
return s; return s;
#endif #endif
return NULL; return NULL;
@ -648,7 +655,7 @@ static boolean SOCK_Get(void)
// check if it's a banned dude so we can send a refusal later // check if it's a banned dude so we can send a refusal later
for (i = 0; i < numbans; i++) for (i = 0; i < numbans; i++)
{ {
if (SOCK_cmpaddr(&fromaddress, &banned[i], bannedmask[i])) if (SOCK_cmpaddr(&fromaddress, &banned[i].address, banned[i].mask))
{ {
SOCK_bannednode[j] = true; SOCK_bannednode[j] = true;
DEBFILE("This dude has been banned\n"); DEBFILE("This dude has been banned\n");
@ -1411,18 +1418,10 @@ static void AddBannedIndex(void)
banned = Z_ReallocAlign( banned = Z_ReallocAlign(
(void*) banned, (void*) banned,
sizeof(mysockaddr_t) * banned_size, sizeof(banned_t) * banned_size,
PU_STATIC, PU_STATIC,
NULL, NULL,
sizeof(mysockaddr_t) * 8 sizeof(banned_t) * 8
);
bannedmask = Z_ReallocAlign(
(void*) banned,
sizeof(UINT8) * banned_size,
PU_STATIC,
NULL,
sizeof(UINT8) * 8
); );
} }
@ -1431,25 +1430,31 @@ static void AddBannedIndex(void)
static boolean SOCK_Ban(INT32 node) static boolean SOCK_Ban(INT32 node)
{ {
INT32 ban;
if (node > MAXNETNODES) if (node > MAXNETNODES)
return false; return false;
#ifdef NONET #ifdef NONET
(void)ban;
return false; return false;
#else #else
ban = numbans;
AddBannedIndex(); AddBannedIndex();
M_Memcpy(&banned[numbans-1], &clientaddress[node], sizeof (mysockaddr_t)); M_Memcpy(&banned[ban].address, &clientaddress[node], sizeof (mysockaddr_t));
if (banned[numbans-1].any.sa_family == AF_INET)
if (banned[ban].address.any.sa_family == AF_INET)
{ {
banned[numbans-1].ip4.sin_port = 0; banned[ban].address.ip4.sin_port = 0;
bannedmask[numbans-1] = 32; banned[ban].mask = 32;
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else if (banned[numbans-1].any.sa_family == AF_INET6) else if (banned[ban].address.any.sa_family == AF_INET6)
{ {
banned[numbans-1].ip6.sin6_port = 0; banned[ban].address.ip6.sin6_port = 0;
bannedmask[numbans-1] = 128; banned[ban].mask = 128;
} }
#endif #endif
@ -1484,25 +1489,29 @@ static boolean SOCK_SetBanAddress(const char *address, const char *mask)
while (runp != NULL) while (runp != NULL)
{ {
INT32 ban;
ban = numbans;
AddBannedIndex(); AddBannedIndex();
memcpy(&banned[numbans-1], runp->ai_addr, runp->ai_addrlen); memcpy(&banned[ban].address, runp->ai_addr, runp->ai_addrlen);
if (mask) if (mask)
bannedmask[numbans-1] = (UINT8)atoi(mask); banned[ban].mask = (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-1] = 128; banned[ban].mask = 128;
#endif #endif
else else
bannedmask[numbans-1] = 32; banned[ban].mask = 32;
if (bannedmask[numbans-1] > 32 && runp->ai_family == AF_INET) if (banned[ban].mask > 32 && runp->ai_family == AF_INET)
bannedmask[numbans-1] = 32; banned[ban].mask = 32;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else if (bannedmask[numbans-1] > 128 && runp->ai_family == AF_INET6) else if (banned[ban].mask > 128 && runp->ai_family == AF_INET6)
bannedmask[numbans-1] = 128; banned[ban].mask = 128;
#endif #endif
runp = runp->ai_next; runp = runp->ai_next;
} }
@ -1517,7 +1526,6 @@ static void SOCK_ClearBans(void)
numbans = 0; numbans = 0;
banned_size = 0; banned_size = 0;
banned = NULL; banned = NULL;
bannedmask = NULL;
} }
boolean I_InitTcpNetwork(void) boolean I_InitTcpNetwork(void)