okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Introduce new NET_CompareBaseAdrMask for easy comparison of ip address ranges

Browse source 
- Overhaul of the new banning functions:
  * basic check for redundant bans/exceptions
  * introduction of sv_banFile to make it possible to configure the file where to read bans and exceptions from
  * bans can now be deleted by giving address ranges, too.
This commit is contained in:
Thilo Schulz 2009-05-24 16:58:08 +00:00
parent 1f779efbb8
commit 50ca55702f
8 changed files with 303 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

75
code/qcommon/net_ip.c
View file

@ -382,39 +382,90 @@ qboolean Sys_StringToAdr( const char *s, netadr_t *a, netadrtype_t family ) {
/*
===================
NET_CompareBaseAdr
NET_CompareBaseAdrMask
Compares without the port
Compare without port, and up to the bit number given in netmask.
===================
*/
qboolean NET_CompareBaseAdr (netadr_t a, netadr_t b)
qboolean NET_CompareBaseAdrMask(netadr_t a, netadr_t b, int netmask)
{
qboolean differed;
byte cmpmask, *addra, *addrb;
int curbyte;
if (a.type != b.type)
return qfalse;
if (a.type == NA_LOOPBACK)
return qtrue;
if (a.type == NA_IP)
if(a.type == NA_IP)
{
if(!memcmp(a.ip, b.ip, sizeof(a.ip)))
return qtrue;
addra = (byte *) &a.ip;
addrb = (byte *) &b.ip;
return qfalse;
if(netmask < 0 || netmask > 32)
netmask = 32;
}
if (a.type == NA_IP6)
else if(a.type == NA_IP6)
{
if(!memcmp(a.ip6, b.ip6, sizeof(a.ip6)) && a.scope_id == b.scope_id)
return qtrue;
addra = (byte *) &a.ip6;
addrb = (byte *) &b.ip6;
if(netmask < 0 || netmask > 128)
netmask = 128;
}
else
{
Com_Printf ("NET_CompareBaseAdr: bad address type\n");
return qfalse;
}
Com_Printf ("NET_CompareBaseAdr: bad address type\n");
differed = qfalse;
curbyte = 0;
while(netmask > 7)
{
if(addra[curbyte] != addrb[curbyte])
{
differed = qtrue;
break;
}
curbyte++;
netmask -= 8;
}
if(differed)
return qfalse;
if(netmask)
{
cmpmask = (1 << netmask) - 1;
cmpmask <<= 8 - netmask;
if((addra[curbyte] & cmpmask) == (addrb[curbyte] & cmpmask))
return qtrue;
}
else
return qtrue;
return qfalse;
}
/*
===================
NET_CompareBaseAdr
Compares without the port
===================
*/
qboolean NET_CompareBaseAdr (netadr_t a, netadr_t b)
{
return NET_CompareBaseAdrMask(a, b, -1);
}
const char *NET_AdrToString (netadr_t a)
{
static char s[NET_ADDRSTRMAXLEN];