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: drop key ms protocol extension

Browse Source
This commit is contained in:
Alibek Omarov
2026-06-06 01:00:21 +05:00
parent 8fad3bbad6
commit c444ab882a
2 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
engine/client/cl_main.c
View File

@@ -1365,13 +1365,7 @@ static void CL_CheckForResend( void )
netadr_t adr;
if( cls.internetservers_wait )
{
cls.internetservers_wait = NET_MasterQuery(
cls.internetservers_key,
cls.internetservers_nat,
cls.internetservers_customfilter
);
}
cls.internetservers_wait = NET_MasterQuery( 1, cls.internetservers_nat, cls.internetservers_customfilter );
// if the local server is running and we aren't then connect
if( cls.state == ca_disconnected && SV_Active( ))
@@ -1864,14 +1858,10 @@ static void CL_InternetServers_f( void )
cls.internetservers_nat = cl_nat.value != 0.0f;
cls.internetservers_pending = true;
cls.internetservers_key = COM_RandomLong( 1, 0x7FFFFFFF );
Q_strncpy( cls.internetservers_customfilter, Cmd_Argv( 1 ), sizeof( cls.internetservers_customfilter ));
cls.internetservers_wait = NET_MasterQuery(
cls.internetservers_key,
cls.internetservers_nat,
cls.internetservers_customfilter
);
// the key is dead extension, keep for compatibility until we use UDP based master server protocol
cls.internetservers_wait = NET_MasterQuery( 1, cls.internetservers_nat, cls.internetservers_customfilter );
}
static void CL_QueryServer( netadr_t adr, connprotocol_t proto )
@@ -2627,25 +2617,13 @@ static void CL_ServerList( netadr_t from, sizebuf_t *msg )
return;
}
// check the extra header
if( proto == PROTO_CURRENT )
{
// dead extension
if( MSG_ReadByte( msg ) == 0x7f )
{
uint32_t key = MSG_ReadDword( msg );
if( cls.internetservers_key != key )
{
Con_Printf( S_WARN "unexpected server list packet from %s (invalid key)\n", NET_AdrToString( from ));
return;
}
MSG_ReadByte( msg ); // reserved byte
}
else
{
Con_Printf( S_WARN "invalid server list packet from %s (missing extra header)\n", NET_AdrToString( from ));
return;
MSG_ReadDword( msg ); // was key
MSG_ReadByte( msg ); // was reserved
}
}
@@ -2666,6 +2644,7 @@ static void CL_ServerList( netadr_t from, sizebuf_t *msg )
MSG_ReadBytes( msg, servadr.ip, sizeof( servadr.ip ), sizeof( servadr.ip )); // 4 bytes for IP
NET_NetadrSetType( &servadr, NA_IP );
}
MSG_ReadBytes( msg, &servadr.port, sizeof( servadr.port ), sizeof( servadr.port )); // 2 bytes for Port, in network byte order
// list is ends here

1
engine/client/client.h
View File

@@ -645,7 +645,6 @@ typedef struct
qboolean internetservers_pending; // if true, clean master server pings
qboolean internetservers_nat;
string internetservers_customfilter;
uint32_t internetservers_key; // compare key to validate master server reply
// multiprotocol support
connprotocol_t legacymode;