qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-25 02:52:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix /0 and /9 masks to not give an error

Browse source 
- consolidate some duplicate code into SV_PrintIP, which returns a
  readable ip address allocated from a static buffer
- remove some debugging prints (addip is now silent on success)
This commit is contained in:
Adam Olsen 2001-09-17 06:10:39 +00:00
parent de716f07e7
commit d77fcc8695
1 changed files with 23 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
qw/source/sv_main.c
View file

@ -1105,6 +1105,21 @@ SV_GenerateIPMasks (void)
} }
} }
// Note: this function is non-reentrant and not threadsafe
const char *
SV_PrintIP (byte *ip)
{
#ifdef HAVE_IPV6
static char buf[INET6_ADDRSTRLEN];
if (!inet_ntop (AF_INET6, ip, buf, INET6_ADDRSTRLEN))
#else
static char buf[INET_ADDRSTRLEN];
if (!inet_ntop (AF_INET, ip, buf, INET_ADDRSTRLEN))
#endif
Sys_Error ("SV_CleanIPList: inet_ntop_failed. wtf?\n");
return buf;
}
static inline void static inline void
SV_MaskIPTrim (byte *ip, int mask) SV_MaskIPTrim (byte *ip, int mask)
{ {
@ -1188,8 +1203,6 @@ SV_StringToFilter (const char *address, ipfilter_t *f)
char *slash; char *slash;
char *c; char *c;
Con_Printf ("SV_StringToFilter: '%s'\n", address);
s = strdup (address); s = strdup (address);
if (!s) if (!s)
Sys_Error ("SV_StringToFilter: memory allocation failure\n"); Sys_Error ("SV_StringToFilter: memory allocation failure\n");
@ -1199,7 +1212,7 @@ SV_StringToFilter (const char *address, ipfilter_t *f)
char *endptr; char *endptr;
*slash = '\0'; *slash = '\0';
slash++; slash++;
if (*slash <= '0' || *slash >= '9' || strchr (slash, '/')) if (*slash < '0' || *slash > '9' || strchr (slash, '/'))
goto bad_address; goto bad_address;
mask = strtol (slash, &endptr, 10); mask = strtol (slash, &endptr, 10);
if (!*slash || *endptr) if (!*slash || *endptr)
@ -1221,9 +1234,7 @@ SV_StringToFilter (const char *address, ipfilter_t *f)
if (*c == '.') if (*c == '.')
c++; c++;
j = strtol (c, &c, 10); j = strtol (c, &c, 10);
if (j < 0 || j > 255) if (j < 0 || j > 255 || i >= sizeof (b))
goto bad_address;
if (i >= sizeof (b))
goto bad_address; goto bad_address;
b[i++] = j; b[i++] = j;
} while (*c == '.'); } while (*c == '.');
@ -1280,29 +1291,19 @@ SV_RemoveIPFilter (int i)
void void
SV_CleanIPList (void) SV_CleanIPList (void)
{ {
// FIXME: some of this is duplicated from listip
int i; int i;
char *type; char *type;
for (i = 0; i < numipfilters;) { for (i = 0; i < numipfilters;) {
if (ipfilters[i].time && (ipfilters[i].time < realtime)) { if (ipfilters[i].time && (ipfilters[i].time < realtime)) {
#ifdef HAVE_IPV6
char buf[INET6_ADDRSTRLEN];
if (!inet_ntop (AF_INET6, ipfilters[i].ip, buf, INET6_ADDRSTRLEN))
Sys_Error ("SV_CleanIPList: inet_ntop failed. wtf?\n");
#else
char buf[INET_ADDRSTRLEN];
if (!inet_ntop (AF_INET, ipfilters[i].ip, buf, INET_ADDRSTRLEN))
Sys_Error ("SV_CleanIPList: inet_ntop_failed. wtf?\n");
#endif
switch (ipfilters[i].type) { switch (ipfilters[i].type) {
case ft_ban: type = "Ban"; break; case ft_ban: type = "Ban"; break;
case ft_mute: type = "Mute"; break; case ft_mute: type = "Mute"; break;
case ft_cuff: type = "Cuff"; break; case ft_cuff: type = "Cuff"; break;
default: Sys_Error ("SV_CleanIPList: invalid filter type"); default: Sys_Error ("SV_CleanIPList: invalid filter type");
} }
SV_Printf ("SV_CleanIPList: %s for %s/%d removed\n", SV_Printf ("SV_CleanIPList: %s for %s/%d removed\n", type,
type, buf, ipfilters[i].mask); SV_PrintIP (ipfilters[i].ip), ipfilters[i].mask);
SV_RemoveIPFilter (i); SV_RemoveIPFilter (i);
} else } else
i++; i++;
@ -1416,22 +1417,10 @@ SV_ListIP_f (void)
{ {
int i; int i;
char *type; char *type;
#ifdef HAVE_IPV6
char buf[INET6_ADDRSTRLEN + 1];
#else
char buf[INET_ADDRSTRLEN + 1];
#endif
char timestr[30]; char timestr[30];
SV_Printf ("Filter list:\n"); SV_Printf ("Filter list:\n");
for (i = 0; i < numipfilters; i++) { for (i = 0; i < numipfilters; i++) {
#ifdef HAVE_IPV6
if (!inet_ntop (AF_INET6, ipfilters[i].ip, buf, sizeof (buf)))
#else
if (!inet_ntop (AF_INET, ipfilters[i].ip, buf, sizeof (buf)))
#endif
Sys_Error ("SV_CleanIPList: inet_ntop_failed. wtf?\n");
switch (ipfilters[i].type) { switch (ipfilters[i].type) {
case ft_ban: type = "Ban:"; break; case ft_ban: type = "Ban:"; break;
case ft_mute: type = "Mute:"; break; case ft_mute: type = "Mute:"; break;
@ -1444,7 +1433,9 @@ SV_ListIP_f (void)
(int) (ipfilters[i].time ? ipfilters[i].time - realtime : 0)); (int) (ipfilters[i].time ? ipfilters[i].time - realtime : 0));
else else
strcpy (timestr, "Permanent"); strcpy (timestr, "Permanent");
SV_Printf ("%-5s %-10s %s/%u\n", type, timestr, buf, ipfilters[i].mask);
SV_Printf ("%-5s %-10s %s/%u\n", type, timestr,
SV_PrintIP (ipfilters[i].ip), ipfilters[i].mask);
} }
} }