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: client: don't require cookie echo when server didn't negotiate NET_EXT_NETCHAN_COOKIE

Browse Source
This commit is contained in:
Alibek Omarov
2026-05-26 03:10:31 +05:00
parent e87b14468d
commit 21cc9feca7
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
engine/client/cl_main.c
View File

@@ -1136,6 +1136,7 @@ static void CL_SendConnectPacket( connprotocol_t proto, int challenge )
}
cls.broker_wait = false;
cls.netchan_pending_cookie = 0;
if( proto == PROTO_GOLDSRC )
{
@@ -1181,7 +1182,6 @@ static void CL_SendConnectPacket( connprotocol_t proto, int challenge )
cls.netchan_pending_cookie = ( a << 48 ) | ( b << 32 ) | ( c << 16 ) | d;
Info_SetValueForKeyf( protinfo, "cookie", sizeof( protinfo ), "%016"PRIx64, cls.netchan_pending_cookie );
}
else cls.netchan_pending_cookie = 0;
Netchan_OutOfBandPrint( NS_CLIENT, adr, C2S_CONNECT" %i %i \"%s\" \"%s\"\n", PROTOCOL_VERSION, challenge, protinfo, cls.userinfo );
Con_Printf( "Trying to connect with modern protocol\n" );
@@ -2408,25 +2408,34 @@ static void CL_ClientConnect( connprotocol_t proto, const char *c, netadr_t from
if( cls.netchan_pending_cookie != 0 )
{
const char *cookie_str = Info_ValueForKey( Cmd_Argv( 1 ), "cookie" );
int server_extensions = Q_atoi( Info_ValueForKey( Cmd_Argv( 1 ), "ext" ));
if( Q_strlen( cookie_str ) != 16 )
if( FBitSet( server_extensions, NET_EXT_NETCHAN_COOKIE ))
{
Con_Reportf( S_WARN "%s: missing cookie echo from %s, ignoring (possible spoof)\n", __func__, NET_AdrToString( from ));
return;
const char *cookie_str = Info_ValueForKey( Cmd_Argv( 1 ), "cookie" );
if( Q_strlen( cookie_str ) != 16 )
{
Con_Reportf( S_WARN "%s: missing cookie echo from %s, ignoring (possible spoof)\n", __func__, NET_AdrToString( from ));
return;
}
byte buf[8];
COM_HexConvert( cookie_str, 16, buf );
uint64_t echoed = 0;
for( int i = 0; i < 8; i++ )
echoed = ( echoed << 8 ) | buf[i];
if( echoed != cls.netchan_pending_cookie )
{
Con_Reportf( S_WARN "%s: invalid cookie echo from %s, ignoring (possible spoof)\n", __func__, NET_AdrToString( from ));
return;
}
}
byte buf[8];
COM_HexConvert( cookie_str, 16, buf );
uint64_t echoed = 0;
for( int i = 0; i < 8; i++ )
echoed = ( echoed << 8 ) | buf[i];
if( echoed != cls.netchan_pending_cookie )
else
{
Con_Reportf( S_WARN "%s: invalid cookie echo from %s, ignoring (possible spoof)\n", __func__, NET_AdrToString( from ));
return;
cls.netchan_pending_cookie = 0;
}
}