static double nextheartbeattime = 0;
sizebuf_t net_message;
+static qbyte net_message_buf[NET_MAXMESSAGE];
cvar_t net_messagetimeout = {0, "net_messagetimeout","300"};
cvar_t net_messagerejointimeout = {0, "net_messagerejointimeout","10"};
{
int result = 0; // > 0 if for numbers A > B and for text if A < B
- if( serverlist_sortbyfield == SLIF_PING )
- result = A->info.ping - B->info.ping;
- else if( serverlist_sortbyfield == SLIF_MAXPLAYERS )
- result = A->info.maxplayers - B->info.maxplayers;
- else if( serverlist_sortbyfield == SLIF_NUMPLAYERS )
- result = A->info.numplayers - B->info.numplayers;
- else if( serverlist_sortbyfield == SLIF_PROTOCOL )
- result = A->info.protocol - B->info.protocol;
- else if( serverlist_sortbyfield == SLIF_CNAME )
- result = strcmp( B->info.cname, A->info.cname );
- else if( serverlist_sortbyfield == SLIF_GAME )
- result = strcmp( B->info.game, A->info.game );
- else if( serverlist_sortbyfield == SLIF_MAP )
- result = strcmp( B->info.map, A->info.map );
- else if( serverlist_sortbyfield == SLIF_MOD )
- result = strcmp( B->info.mod, A->info.mod );
- else if( serverlist_sortbyfield == SLIF_NAME )
- result = strcmp( B->info.name, A->info.name );
+ switch( serverlist_sortbyfield ) {
+ case SLIF_PING:
+ result = A->info.ping - B->info.ping;
+ break;
+ case SLIF_MAXPLAYERS:
+ result = A->info.maxplayers - B->info.maxplayers;
+ break;
+ case SLIF_NUMPLAYERS:
+ result = A->info.numplayers - B->info.numplayers;
+ break;
+ case SLIF_PROTOCOL:
+ result = A->info.protocol - B->info.protocol;
+ break;
+ case SLIF_CNAME:
+ result = strcmp( B->info.cname, A->info.cname );
+ break;
+ case SLIF_GAME:
+ result = strcmp( B->info.game, A->info.game );
+ break;
+ case SLIF_MAP:
+ result = strcmp( B->info.map, A->info.map );
+ break;
+ case SLIF_MOD:
+ result = strcmp( B->info.mod, A->info.mod );
+ break;
+ case SLIF_NAME:
+ result = strcmp( B->info.name, A->info.name );
+ break;
+ default:
+ Con_DPrint( "_ServerList_Entry_Compare: Bad serverlist_sortbyfield!\n" );
+ break;
+ }
if( serverlist_sortdescending )
return result > 0;
static qboolean _ServerList_CompareInt( int A, serverlist_maskop_t op, int B )
{
- if( op == SLMO_LESS )
- return A < B;
- else if( op == SLMO_LESSEQUAL )
- return A <= B;
- else if( op == SLMO_EQUAL )
- return A == B;
- else if( op == SLMO_GREATER )
- return A > B;
- else if( op == SLMO_NOTEQUAL )
- return A != B;
- else // SLMO_GREATEREQUAL
- return A >= B;
+ // This should actually be done with some intermediate and end-of-function return
+ switch( op ) {
+ case SLMO_LESS:
+ return A < B;
+ case SLMO_LESSEQUAL:
+ return A <= B;
+ case SLMO_EQUAL:
+ return A == B;
+ case SLMO_GREATER:
+ return A > B;
+ case SLMO_NOTEQUAL:
+ return A != B;
+ case SLMO_GREATEREQUAL:
+ return A >= B;
+ default:
+ Con_DPrint( "_ServerList_CompareInt: Bad op!\n" );
+ return false;
+ }
}
static qboolean _ServerList_CompareStr( const char *A, serverlist_maskop_t op, const char *B )
{
- if( op == SLMO_CONTAINS ) // A info B mask
- return *B && !!strstr( A, B ); // we want a real bool
- else if( op == SLMO_NOTCONTAIN )
- return !*B || !strstr( A, B );
- else if( op == SLMO_LESS )
- return strcmp( A, B ) < 0;
- else if( op == SLMO_LESSEQUAL )
- return strcmp( A, B ) <= 0;
- else if( op == SLMO_EQUAL )
- return strcmp( A, B ) == 0;
- else if( op == SLMO_GREATER )
- return strcmp( A, B ) > 0;
- else if( op == SLMO_NOTEQUAL )
- return strcmp( A, B ) != 0;
- else // SLMO_GREATEREQUAL
- return strcmp( A, B ) >= 0;
+ // Same here, also using an intermediate & final return would be more appropriate
+ // A info B mask
+ switch( op ) {
+ case SLMO_CONTAINS:
+ return *B && !!strstr( A, B ); // we want a real bool
+ case SLMO_NOTCONTAIN:
+ return !*B || !strstr( A, B );
+ case SLMO_LESS:
+ return strcmp( A, B ) < 0;
+ case SLMO_LESSEQUAL:
+ return strcmp( A, B ) <= 0;
+ case SLMO_EQUAL:
+ return strcmp( A, B ) == 0;
+ case SLMO_GREATER:
+ return strcmp( A, B ) > 0;
+ case SLMO_NOTEQUAL:
+ return strcmp( A, B ) != 0;
+ case SLMO_GREATEREQUAL:
+ return strcmp( A, B ) >= 0;
+ default:
+ Con_DPrint( "_ServerList_CompareStr: Bad op!\n" );
+ return false;
+ }
}
static qboolean _ServerList_Entry_Mask( serverlist_mask_t *mask, serverlist_info_t *info )
cls.demonum = -1; // not in the demo loop now
cls.state = ca_connected;
cls.signon = 0; // need all the signon messages before playing
- CL_ClearState();
}
int NetConn_IsLocalGame(void)
{
int n;
- serverquerycount++;
-
dpsnprintf (ipstring, sizeof (ipstring), "%u.%u.%u.%u:%u", data[1], data[2], data[3], data[4], (data[5] << 8) | data[6]);
if (developer.integer)
Con_Printf("Requesting info from server %s\n", ipstring);
if( serverlist_cachecount == SERVERLIST_TOTALSIZE )
break;
// also ignore it if we have already queried it (other master server response)
- for( n = 0 ; n < serverlist_cachecount ; n++ )
+ for( n = 0 ; n < serverlist_cachecount ; n++ )
if( !strcmp( ipstring, serverlist_cache[ n ].info.cname ) )
break;
- if( n < serverlist_cachecount )
- break;
+ if( n >= serverlist_cachecount )
+ {
+ serverquerycount++;
- LHNETADDRESS_FromString(&svaddress, ipstring, 0);
- NetConn_WriteString(mysocket, "\377\377\377\377getinfo", &svaddress);
+ LHNETADDRESS_FromString(&svaddress, ipstring, 0);
+ NetConn_WriteString(mysocket, "\377\377\377\377getinfo", &svaddress);
- memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount]));
- // store the data the engine cares about (address and ping)
- strlcpy (serverlist_cache[serverlist_cachecount].info.cname, ipstring, sizeof (serverlist_cache[serverlist_cachecount].info.cname));
- serverlist_cache[serverlist_cachecount].info.ping = 100000;
- serverlist_cache[serverlist_cachecount].querytime = realtime;
- // if not in the slist menu we should print the server to console
- if (serverlist_consoleoutput)
- Con_Printf("querying %s\n", ipstring);
+ memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount]));
+ // store the data the engine cares about (address and ping)
+ strlcpy (serverlist_cache[serverlist_cachecount].info.cname, ipstring, sizeof (serverlist_cache[serverlist_cachecount].info.cname));
+ serverlist_cache[serverlist_cachecount].info.ping = 100000;
+ serverlist_cache[serverlist_cachecount].querytime = realtime;
+ // if not in the slist menu we should print the server to console
+ if (serverlist_consoleoutput)
+ Con_Printf("querying %s\n", ipstring);
- ++serverlist_cachecount;
+ ++serverlist_cachecount;
+ }
// move on to next address in packet
data += 7;
{
int i;
lhnetaddress_t tempaddress;
- netconn_mempool = Mem_AllocPool("Networking", 0, NULL);
+ netconn_mempool = Mem_AllocPool("network connections", 0, NULL);
Cmd_AddCommand("net_stats", Net_Stats_f);
Cmd_AddCommand("net_slist", Net_Slist_f);
Cmd_AddCommand("heartbeat", Net_Heartbeat_f);
}
cl_numsockets = 0;
sv_numsockets = 0;
- SZ_Alloc(&net_message, NET_MAXMESSAGE, "net_message");
+ net_message.data = net_message_buf;
+ net_message.maxsize = sizeof(net_message_buf);
+ net_message.cursize = 0;
LHNET_Init();
}
projects / xonotic / darkplaces.git / blobdiff