reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2024-12-29 08:05:50 +03:00
Code Issues Projects Releases Wiki Activity

Fix unit-test

Browse Source
This commit is contained in:
s1lentq 2024-01-18 00:46:45 +07:00
parent 62407e0dd6
commit 355172d6db
2 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rehlds/engine/filter.h
View File

@ -42,9 +42,7 @@ typedef struct ipfilter_s
} compare; } compare;
float banEndTime; float banEndTime;
float banTime; float banTime;
#ifdef REHLDS_FIXES
int cidr; int cidr;
#endif // REHLDS_FIXES
} ipfilter_t; } ipfilter_t;
typedef struct userfilter_s typedef struct userfilter_s

39
rehlds/engine/sv_main.cpp
View File

@ -6553,7 +6553,6 @@ int EXT_FUNC RegUserMsg(const char *pszName, int iSize)
return pNewMsg->iMsg; return pNewMsg->iMsg;
} }
#ifdef REHLDS_FIXES
uint32_t CIDRToMask(int cidr) uint32_t CIDRToMask(int cidr)
{ {
return htonl(0xFFFFFFFFull << (32 - cidr)); return htonl(0xFFFFFFFFull << (32 - cidr));
@ -6703,44 +6702,6 @@ qboolean StringToFilter(const char *s, ipfilter_t *f)
return true; return true;
} }
#else // REHLDS_FIXES
qboolean StringToFilter(const char *s, ipfilter_t *f)
{
char num[128];
unsigned char b[4] = { 0, 0, 0, 0 };
unsigned char m[4] = { 0, 0, 0, 0 };
const char* cc = s;
int i = 0;
while (1)
{
if (*cc < '0' || *cc > '9')
break;
int j = 0;
while (*cc >= '0' && *cc <= '9')
num[j++] = *(cc++);
num[j] = 0;
b[i] = Q_atoi(num);
if (b[i])
m[i] = -1;
if (*cc)
{
++cc;
++i;
if (i < 4)
continue;
}
f->mask = *(uint32 *)m;
f->compare.u32 = *(uint32 *)b;
return TRUE;
}
Con_Printf("Bad filter address: %s\n", cc);
return FALSE;
}
#endif // REHLDS_FIXES
USERID_t *SV_StringToUserID(const char *str) USERID_t *SV_StringToUserID(const char *str)
{ {