RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: fix NET_IsReservedAdr checks for IPv6, treat IPv4-mapped-as-IPv6 as IPv4

Browse Source
This commit is contained in:
Alibek Omarov
2026-05-23 21:17:01 +05:00
parent 24abd2deb2
commit eb9de1cac8
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
engine/common/net_ws.c
View File

@@ -770,6 +770,16 @@ NET_IsReservedAdr
Check for reserved ip's
====================
*/
static qboolean NET_IsReservedIPv4( const uint8_t ip[4] )
{
// Following checks was imported from GameNetworkingSockets library
return ( ip[0] == 10 ) // 10.x.x.x is reserved
|| ( ip[0] == 127 ) // 127.x.x.x
|| ( ip[0] == 169 && ip[1] == 254 ) // 169.254.x.x is link-local ipv4
|| ( ip[0] == 172 && ip[1] >= 16 && ip[1] <= 31 ) // 172.16.x.x - 172.31.x.x
|| ( ip[0] == 192 && ip[1] == 168 ); // 192.168.x.x
}
qboolean NET_IsReservedAdr( netadr_t a )
{
netadrtype_t type_a = NET_NetadrType( &a );
@@ -777,18 +787,8 @@ qboolean NET_IsReservedAdr( netadr_t a )
if( type_a == NA_LOOPBACK )
return true;
// Following checks was imported from GameNetworkingSockets library
if( type_a == NA_IP )
{
if(( a.ip[0] == 10 ) || // 10.x.x.x is reserved
( a.ip[0] == 127 ) || // 127.x.x.x
( a.ip[0] == 169 && a.ip[1] == 254 ) || // 169.254.x.x is link-local ipv4
( a.ip[0] == 172 && a.ip[1] >= 16 && a.ip[1] <= 31 ) || // 172.16.x.x - 172.31.x.x
( a.ip[0] == 192 && a.ip[1] >= 168 )) // 192.168.x.x
{
return true;
}
}
return NET_IsReservedIPv4( a.ip );
if( type_a == NA_IP6 )
{
@@ -796,19 +796,18 @@ qboolean NET_IsReservedAdr( netadr_t a )
NET_NetadrToIP6Bytes( ip6, &a );
// IPv4-mapped IPv6 (::ffff:0:0/96) — defer to IPv4 reservation check
static const uint8_t v4mapped_prefix[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF };
if( !memcmp( ip6, v4mapped_prefix, sizeof( v4mapped_prefix )))
return NET_IsReservedIPv4( &ip6[12] );
// Private addresses, fc00::/7
// Range is fc00:: to fdff:ffff:etc
if( ip6[0] >= 0xFC && ip6[1] <= 0xFD )
{
if(( ip6[0] & 0xFE ) == 0xFC )
return true;
}
// Link-local fe80::/10
// Range is fe80:: to febf::
if( ip6[0] == 0xFE && ( ip6[1] >= 0x80 && ip6[1] <= 0xBF ))
{
if( ip6[0] == 0xFE && ( ip6[1] & 0xC0 ) == 0x80 )
return true;
}
}
return false;