vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: client: rework NetAPI response parsing

Browse source
This commit is contained in:
Alibek Omarov 2024-07-07 03:30:34 +03:00
parent 1b4427f13f
commit f8b958738a
1 changed files with 45 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
engine/client/cl_main.c
View file

@ -1861,9 +1861,9 @@ CL_ParseNETInfoMessage
Handle a reply from a netinfo Handle a reply from a netinfo
================= =================
*/ */
static void CL_ParseNETInfoMessage( netadr_t from, sizebuf_t *msg, const char *s ) static void CL_ParseNETInfoMessage( netadr_t from, const char *s )
{ {
net_request_t *nr; net_request_t *nr = NULL;
static char infostring[MAX_INFO_STRING+8]; static char infostring[MAX_INFO_STRING+8];
int i, context, type; int i, context, type;
int errorBits = 0; int errorBits = 0;
@ -1871,44 +1871,54 @@ static void CL_ParseNETInfoMessage( netadr_t from, sizebuf_t *msg, const char *s
context = Q_atoi( Cmd_Argv( 1 )); context = Q_atoi( Cmd_Argv( 1 ));
type = Q_atoi( Cmd_Argv( 2 )); type = Q_atoi( Cmd_Argv( 2 ));
while( *s != '\\' ) s++; // fetching infostring
// check for errors // find request with specified context and type
val = Info_ValueForKey( s, "neterror" );
if( !Q_stricmp( val, "protocol" ))
SetBits( errorBits, NET_ERROR_PROTO_UNSUPPORTED );
else if( !Q_stricmp( val, "undefined" ))
SetBits( errorBits, NET_ERROR_UNDEFINED );
else if( !Q_stricmp( val, "forbidden" ))
SetBits( errorBits, NET_ERROR_FORBIDDEN );
CL_FixupColorStringsForInfoString( s, infostring );
// find a request with specified context
for( i = 0; i < MAX_REQUESTS; i++ ) for( i = 0; i < MAX_REQUESTS; i++ )
{ {
nr = &clgame.net_requests[i]; if( clgame.net_requests[i].resp.context == context && clgame.net_requests[i].resp.type == type )
if( nr->resp.context == context && nr->resp.type == type )
{ {
// setup the answer nr = &clgame.net_requests[i];
nr->resp.response = infostring; break;
nr->resp.remote_address = from;
nr->resp.error = NET_SUCCESS;
nr->resp.ping = host.realtime - nr->timesend;
if( nr->timeout <= host.realtime )
SetBits( nr->resp.error, NET_ERROR_TIMEOUT );
SetBits( nr->resp.error, errorBits ); // misc error bits
nr->pfnFunc( &nr->resp );
if( !FBitSet( nr->flags, FNETAPI_MULTIPLE_RESPONSE ))
memset( nr, 0, sizeof( *nr )); // done
return;
} }
} }
// not found, ignore
if( nr == NULL )
return;
// find the infostring
while( *s != '\\' && *s )
s++;
if( s[0] == '\\' )
{
// check for errors
val = Info_ValueForKey( s, "neterror" );
if( !Q_stricmp( val, "protocol" ))
SetBits( errorBits, NET_ERROR_PROTO_UNSUPPORTED );
else if( !Q_stricmp( val, "undefined" ))
SetBits( errorBits, NET_ERROR_UNDEFINED );
else if( !Q_stricmp( val, "forbidden" ))
SetBits( errorBits, NET_ERROR_FORBIDDEN );
CL_FixupColorStringsForInfoString( s, infostring );
}
// setup the answer
nr->resp.response = infostring;
nr->resp.remote_address = from;
nr->resp.error = NET_SUCCESS;
nr->resp.ping = host.realtime - nr->timesend;
if( nr->timeout <= host.realtime )
SetBits( nr->resp.error, NET_ERROR_TIMEOUT );
SetBits( nr->resp.error, errorBits ); // misc error bits
nr->pfnFunc( &nr->resp );
if( !FBitSet( nr->flags, FNETAPI_MULTIPLE_RESPONSE ))
memset( nr, 0, sizeof( *nr )); // done
} }
/* /*
@ -2041,7 +2051,7 @@ static void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
else if( !Q_strcmp( c, "netinfo" )) else if( !Q_strcmp( c, "netinfo" ))
{ {
// server responding to a status broadcast // server responding to a status broadcast
CL_ParseNETInfoMessage( from, msg, args ); CL_ParseNETInfoMessage( from, args );
} }
else if( !Q_strcmp( c, "cmd" )) else if( !Q_strcmp( c, "cmd" ))
{ {