diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2010-09-17 21:22:59 +0400 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2010-09-17 21:22:59 +0400 |
| commit | cea1e6775af6bccb3b739d563f26bbd8cea1ad70 (patch) | |
| tree | 1d7f4d7b7e67480ffb8722923ae48c30d676f26c /src/sv_main.c | |
| parent | 45e6aff04accfbafeeb27ebe32382dd75ff80939 (diff) | |
Use netadrip_t union when working with IP addresses.
Diffstat (limited to 'src/sv_main.c')
| -rw-r--r-- | src/sv_main.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/sv_main.c b/src/sv_main.c index e50414f..b5f0fe0 100644 --- a/src/sv_main.c +++ b/src/sv_main.c @@ -281,12 +281,11 @@ static void SV_RateInit( ratelimit_t *r, const char *s ) { r->period = period; } -addrmatch_t *SV_MatchAddress( list_t *list, netadr_t *address ) { - uint32_t addr = *( uint32_t * )address->ip; +addrmatch_t *SV_MatchAddress( list_t *list, netadr_t *addr ) { addrmatch_t *match; LIST_FOR_EACH( addrmatch_t, match, list, entry ) { - if( ( addr & match->mask ) == ( match->addr & match->mask ) ) { + if( ( addr->ip.u32 & match->mask ) == ( match->addr.u32 & match->mask ) ) { match->hits++; match->time = time( NULL ); return match; @@ -1074,13 +1073,6 @@ static void SV_ConnectionlessPacket( void ) { c = Cmd_Argv( 0 ); Com_DPrintf( "ServerPacket[%s]: %s\n", NET_AdrToString( &net_from ), c ); - if( !NET_IsLocalAddress( &net_from ) && net_from.ip[0] == 127 && - net_from.port == Cvar_VariableInteger( "net_port" ) ) - { - Com_DPrintf( "dropped connectionless packet from self\n" ); - return; - } - if( !strcmp( c, "rcon" ) ) { SVC_RemoteCommand(); return; // accept rcon commands even if not active |