diff options
| author | M. Kristall <mkpdev@gmail.com> | 2010-03-01 01:11:56 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:29 +0000 |
| commit | 117b2c94c3a8fafd9401112699158cbc81a89cd5 (patch) | |
| tree | dd51952a3a0c3f36242bb837e917e4f7165002dc /src/game/g_local.h | |
| parent | ff82aefa975e52f1e25b090225b36645b57faa97 (diff) | |
* Prevent reparsing IP addresses for subnet bans
Diffstat (limited to 'src/game/g_local.h')
| -rw-r--r-- | src/game/g_local.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/game/g_local.h b/src/game/g_local.h index 6ace8093..600ea8a0 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -279,7 +279,7 @@ typedef struct namelog_s { struct namelog_s *next; char name[ MAX_NAMELOG_NAMES ][ MAX_NAME_LENGTH ]; - char ip[ MAX_NAMELOG_ADDRS ][ 40 ]; + addr_t ip[ MAX_NAMELOG_ADDRS ]; char guid[ 33 ]; int slot; qboolean banned; @@ -339,7 +339,7 @@ typedef struct vec3_t lastDeathLocation; char guid[ 33 ]; - char ip[ 40 ]; + addr_t ip; char voice[ MAX_VOICE_NAME_LEN ]; qboolean useUnlagged; // keep track of other players' info for tinfo @@ -768,19 +768,9 @@ qboolean G_InPowerZone( gentity_t *self ); // // g_utils.c // -#define ADDRLEN 16 -typedef struct -{ - enum - { - IPv4, - IPv6 - } type; - byte addr[ ADDRLEN ]; -} addr_t; -qboolean G_AddressParse( const char *str, addr_t *addr, int *netmask ); -qboolean G_AddressCompare( const addr_t *a, const addr_t *b, int netmask ); -qboolean G_AdrCmpStr( const char *a, const char *b ); +//addr_t in g_admin.h for g_admin_ban_t +qboolean G_AddressParse( const char *str, addr_t *addr ); +qboolean G_AddressCompare( const addr_t *a, const addr_t *b ); int G_ParticleSystemIndex( char *name ); int G_ShaderIndex( char *name ); |