X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=netconn.c;h=70866bfed05c5c0df6f9ff2007bb25aa0dc3f520;hb=08b17d6e1f0ba20ac2ec1414a1369b1a098bd06f;hp=9e62d93c7050fa3e14d06a14bd912fc39e3e029d;hpb=3ad7fd58a384148f78dfd1a541e81a69e90dab8f;p=xonotic%2Fdarkplaces.git diff --git a/netconn.c b/netconn.c index 9e62d93c..70866bfe 100755 --- a/netconn.c +++ b/netconn.c @@ -48,19 +48,11 @@ static cvar_t sv_qwmasters [] = {CVAR_SAVE, "sv_qwmaster2", "", "user-chosen qwmaster server 2"}, {CVAR_SAVE, "sv_qwmaster3", "", "user-chosen qwmaster server 3"}, {CVAR_SAVE, "sv_qwmaster4", "", "user-chosen qwmaster server 4"}, - {0, "sv_qwmasterextra1", "192.246.40.37:27000", "id Limbo (admin: id Software)"}, - {0, "sv_qwmasterextra2", "192.246.40.37:27002", "id CTF (admin: id Software)"}, - {0, "sv_qwmasterextra3", "192.246.40.37:27003", "id TeamFortress (admin: id Software)"}, - {0, "sv_qwmasterextra4", "192.246.40.37:27004", "id Miscilaneous (admin: id Software)"}, - {0, "sv_qwmasterextra5", "192.246.40.37:27006", "id Deathmatch Only (admin: id Software)"}, - {0, "sv_qwmasterextra6", "150.254.66.120:27000", "Poland's master server. (admin: unknown)"}, - {0, "sv_qwmasterextra7", "62.112.145.129:27000", "Ocrana master server. (admin: unknown)"}, - {0, "sv_qwmasterextra8", "master.edome.net", "edome master server. (admin: unknown)"}, - {0, "sv_qwmasterextra9", "qwmaster.barrysworld.com", "barrysworld master server. (admin: unknown)"}, - {0, "sv_qwmasterextra10", "qwmaster.ocrana.de:27000", "Ocrana2 master server. (admin: unknown)"}, - {0, "sv_qwmasterextra11", "213.221.174.165:27000", "unknown1 master server. (admin: unknown)"}, - {0, "sv_qwmasterextra12", "195.74.0.8", "unknown2 master server. (admin: unknown)"}, - {0, "sv_qwmasterextra13", "204.182.161.2", "unknown3 master server. (admin: unknown)"}, + {0, "sv_qwmasterextra1", "master.quakeservers.net:27000", "Global master server. (admin: unknown)"}, + {0, "sv_qwmasterextra2", "asgaard.morphos-team.net:27000", "Global master server. (admin: unknown)"}, + {0, "sv_qwmasterextra3", "qwmaster.ocrana.de:27000", "German master server. (admin: unknown)"}, + {0, "sv_qwmasterextra4", "masterserver.exhale.de:27000", "German master server. (admin: unknown)"}, + {0, "sv_qwmasterextra5", "kubus.rulez.pl:27000", "Poland master server. (admin: unknown)"}, {0, NULL, NULL, NULL} }; @@ -191,6 +183,9 @@ static qboolean _ServerList_Entry_Compare( serverlist_entry_t *A, serverlist_ent case SLIF_NUMHUMANS: result = A->info.numhumans - B->info.numhumans; break; + case SLIF_FREESLOTS: + result = A->info.freeslots - B->info.freeslots; + break; case SLIF_PROTOCOL: result = A->info.protocol - B->info.protocol; break; @@ -296,6 +291,8 @@ static qboolean _ServerList_Entry_Mask( serverlist_mask_t *mask, serverlist_info return false; if( !_ServerList_CompareInt( info->numhumans, mask->tests[SLIF_NUMHUMANS], mask->info.numhumans ) ) return false; + if( !_ServerList_CompareInt( info->freeslots, mask->tests[SLIF_FREESLOTS], mask->info.freeslots ) ) + return false; if( !_ServerList_CompareInt( info->protocol, mask->tests[SLIF_PROTOCOL], mask->info.protocol )) return false; if( *mask->info.cname @@ -386,9 +383,12 @@ void ServerList_RebuildViewList(void) int i; serverlist_viewcount = 0; - for( i = 0 ; i < serverlist_cachecount ; i++ ) - if( serverlist_cache[i].query == SQS_QUERIED ) - ServerList_ViewList_Insert( &serverlist_cache[i] ); + for( i = 0 ; i < serverlist_cachecount ; i++ ) { + serverlist_entry_t *entry = &serverlist_cache[i]; + // also display entries that are currently being refreshed [11/8/2007 Black] + if( entry->query == SQS_QUERIED || entry->query == SQS_REFRESHING ) + ServerList_ViewList_Insert( entry ); + } } void ServerList_ResetMasks(void) @@ -404,6 +404,22 @@ void ServerList_ResetMasks(void) serverlist_ormasks[i].info.numbots = -1; } +void ServerList_GetPlayerStatistics(int *numplayerspointer, int *maxplayerspointer) +{ + int i; + int numplayers = 0, maxplayers = 0; + for (i = 0;i < serverlist_cachecount;i++) + { + if (serverlist_cache[i].query == SQS_QUERIED) + { + numplayers += serverlist_cache[i].info.numhumans; + maxplayers += serverlist_cache[i].info.maxplayers; + } + } + *numplayerspointer = numplayers; + *maxplayerspointer = maxplayers; +} + #if 0 static void _ServerList_Test(void) { @@ -420,16 +436,26 @@ static void _ServerList_Test(void) } #endif -void ServerList_QueryList(qboolean querydp, qboolean queryqw) +void ServerList_QueryList(qboolean resetcache, qboolean querydp, qboolean queryqw, qboolean consoleoutput) { masterquerytime = realtime; masterquerycount = 0; masterreplycount = 0; - serverquerycount = 0; - serverreplycount = 0; - serverlist_cachecount = 0; - serverlist_viewcount = 0; - serverlist_consoleoutput = false; + if( resetcache ) { + serverquerycount = 0; + serverreplycount = 0; + serverlist_cachecount = 0; + serverlist_viewcount = 0; + } else { + // refresh all entries + int n; + for( n = 0 ; n < serverlist_cachecount ; n++ ) { + serverlist_entry_t *entry = &serverlist_cache[ n ]; + entry->query = SQS_REFRESHING; + entry->querycounter = 0; + } + } + serverlist_consoleoutput = consoleoutput; //_ServerList_Test(); @@ -711,6 +737,16 @@ int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolvers return 0; } +qboolean NetConn_HaveClientPorts(void) +{ + return !!cl_numsockets; +} + +qboolean NetConn_HaveServerPorts(void) +{ + return !!sv_numsockets; +} + void NetConn_CloseClientPorts(void) { for (;cl_numsockets > 0;cl_numsockets--) @@ -1063,7 +1099,7 @@ static int NetConn_ReceivedMessage(netconn_t *conn, unsigned char *data, int len unsigned int *header; conn->sendMessageLength -= MAX_PACKETFRAGMENT; - memcpy(conn->sendMessage, conn->sendMessage+MAX_PACKETFRAGMENT, conn->sendMessageLength); + memmove(conn->sendMessage, conn->sendMessage+MAX_PACKETFRAGMENT, conn->sendMessageLength); if (conn->sendMessageLength <= MAX_PACKETFRAGMENT) { @@ -1194,10 +1230,15 @@ static int NetConn_ClientParsePacket_ServerList_ProcessReply(const char *address { int n; int pingtime; + serverlist_entry_t *entry = NULL; + // search the cache for this server and update it - for (n = 0;n < serverlist_cachecount;n++) - if (!strcmp(addressstring, serverlist_cache[n].info.cname)) + for (n = 0;n < serverlist_cachecount;n++) { + entry = &serverlist_cache[ n ]; + if (!strcmp(addressstring, entry->info.cname)) break; + } + if (n == serverlist_cachecount) { // LAN search doesnt require an answer from the master server so we wont @@ -1207,43 +1248,89 @@ static int NetConn_ClientParsePacket_ServerList_ProcessReply(const char *address if (serverlist_cachecount == SERVERLIST_TOTALSIZE) return -1; - memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount])); + entry = &serverlist_cache[n]; + + memset(entry, 0, sizeof(*entry)); // store the data the engine cares about (address and ping) - strlcpy(serverlist_cache[serverlist_cachecount].info.cname, addressstring, sizeof(serverlist_cache[serverlist_cachecount].info.cname)); - serverlist_cache[serverlist_cachecount].info.ping = 100000; - serverlist_cache[serverlist_cachecount].querytime = realtime; + strlcpy(entry->info.cname, addressstring, sizeof(entry->info.cname)); + entry->info.ping = 100000; + entry->querytime = realtime; // if not in the slist menu we should print the server to console if (serverlist_consoleoutput) Con_Printf("querying %s\n", addressstring); ++serverlist_cachecount; } // if this is the first reply from this server, count it as having replied - if (serverlist_cache[n].info.ping == 100000) - serverreplycount++; - pingtime = (int)((realtime - serverlist_cache[n].querytime) * 1000.0 + 0.5); + pingtime = (int)((realtime - entry->querytime) * 1000.0 + 0.5); pingtime = bound(0, pingtime, 9999); - // update the ping - serverlist_cache[n].info.ping = min(serverlist_cache[n].info.ping, pingtime); + if (entry->query == SQS_REFRESHING) { + entry->info.ping = pingtime; + entry->query = SQS_QUERIED; + } else { + // convert to unsigned to catch the -1 + // I still dont like this but its better than the old 10000 magic ping number - as in easier to type and read :( [11/8/2007 Black] + entry->info.ping = min((unsigned) entry->info.ping, (unsigned) pingtime); + serverreplycount++; + } + // other server info is updated by the caller return n; } static void NetConn_ClientParsePacket_ServerList_UpdateCache(int n) { - serverlist_info_t *info = &serverlist_cache[n].info; + serverlist_entry_t *entry = &serverlist_cache[n]; + serverlist_info_t *info = &entry->info; // update description strings for engine menu and console output - dpsnprintf(serverlist_cache[n].line1, sizeof(serverlist_cache[n].line1), "^%c%5d^7 ^%c%3u^7/%3u %-65.65s", info->ping >= 300 ? '1' : (info->ping >= 200 ? '3' : '7'), (int)info->ping, ((info->numhumans > 0 && info->numhumans < info->maxplayers) ? (info->numhumans >= 4 ? '7' : '3') : '1'), info->numplayers, info->maxplayers, info->name); - dpsnprintf(serverlist_cache[n].line2, sizeof(serverlist_cache[n].line2), "^4%-21.21s %-19.19s ^%c%-17.17s^4 %-20.20s", info->cname, info->game, (info->gameversion != gameversion.integer) ? '1' : '4', info->mod, info->map); - if (serverlist_cache[n].query == SQS_QUERIED) - ServerList_ViewList_Remove(&serverlist_cache[n]); + dpsnprintf(entry->line1, sizeof(serverlist_cache[n].line1), "^%c%5d^7 ^%c%3u^7/%3u %-65.65s", info->ping >= 300 ? '1' : (info->ping >= 200 ? '3' : '7'), (int)info->ping, ((info->numhumans > 0 && info->numhumans < info->maxplayers) ? (info->numhumans >= 4 ? '7' : '3') : '1'), info->numplayers, info->maxplayers, info->name); + dpsnprintf(entry->line2, sizeof(serverlist_cache[n].line2), "^4%-21.21s %-19.19s ^%c%-17.17s^4 %-20.20s", info->cname, info->game, (info->gameversion != gameversion.integer) ? '1' : '4', info->mod, info->map); + if (entry->query == SQS_QUERIED) + ServerList_ViewList_Remove(entry); // if not in the slist menu we should print the server to console (if wanted) else if( serverlist_consoleoutput ) Con_Printf("%s\n%s\n", serverlist_cache[n].line1, serverlist_cache[n].line2); // and finally, update the view set - ServerList_ViewList_Insert( &serverlist_cache[n] ); + ServerList_ViewList_Insert( entry ); + // update the entry's state serverlist_cache[n].query = SQS_QUERIED; } +// returns true, if it's sensible to continue the processing +static qboolean NetConn_ClientParsePacket_ServerList_PrepareQuery( int protocol, const char *ipstring ) { + int n; + serverlist_entry_t *entry; + + // ignore the rest of the message if the serverlist is full + if( serverlist_cachecount == SERVERLIST_TOTALSIZE ) + return false; + // also ignore it if we have already queried it (other master server response) + for( n = 0 ; n < serverlist_cachecount ; n++ ) + if( !strcmp( ipstring, serverlist_cache[ n ].info.cname ) ) + break; + + entry = &serverlist_cache[n]; + + if( n < serverlist_cachecount ) { + // the entry has already been queried once or + return true; + } + + memset(entry, 0, sizeof(entry)); + entry->protocol = protocol; + // store the data the engine cares about (address and ping) + strlcpy (entry->info.cname, ipstring, sizeof(entry->info.cname)); + + // no, then reset the ping right away + entry->info.ping = -1; + // we also want to increase the serverlist_cachecount then + serverlist_cachecount++; + serverquerycount++; + + entry->query = SQS_QUERYING; + + return true; +} + static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress) { qboolean fromserver; @@ -1337,6 +1424,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat if ((s = SearchInfostring(string, "sv_maxclients")) != NULL) info->maxplayers = atoi(s); if ((s = SearchInfostring(string, "gameversion" )) != NULL) info->gameversion = atoi(s); info->numhumans = info->numplayers - max(0, info->numbots); + info->freeslots = info->maxplayers - info->numplayers; NetConn_ClientParsePacket_ServerList_UpdateCache(n); @@ -1352,30 +1440,12 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat Con_Print("received DarkPlaces server list...\n"); while (length >= 7 && data[0] == '\\' && (data[1] != 0xFF || data[2] != 0xFF || data[3] != 0xFF || data[4] != 0xFF) && data[5] * 256 + data[6] != 0) { - int n; - dpsnprintf (ipstring, sizeof (ipstring), "%u.%u.%u.%u:%u", data[1], data[2], data[3], data[4], data[5] * 256 + data[6]); if (serverlist_consoleoutput && developer_networking.integer) Con_Printf("Requesting info from DarkPlaces server %s\n", ipstring); - // ignore the rest of the message if the serverlist is full - if( serverlist_cachecount == SERVERLIST_TOTALSIZE ) + + if( !NetConn_ClientParsePacket_ServerList_PrepareQuery( PROTOCOL_DARKPLACES7, ipstring ) ) { break; - // also ignore it if we have already queried it (other master server response) - for( n = 0 ; n < serverlist_cachecount ; n++ ) - if( !strcmp( ipstring, serverlist_cache[ n ].info.cname ) ) - break; - if( n >= serverlist_cachecount ) - { - serverquerycount++; - - memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount])); - serverlist_cache[serverlist_cachecount].protocol = PROTOCOL_DARKPLACES7; - // 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].query = SQS_QUERYING; - - ++serverlist_cachecount; } // move on to next address in packet @@ -1397,30 +1467,12 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat Con_Printf("received QuakeWorld server list from %s...\n", addressstring2); while (length >= 6 && (data[0] != 0xFF || data[1] != 0xFF || data[2] != 0xFF || data[3] != 0xFF) && data[4] * 256 + data[5] != 0) { - int n; - dpsnprintf (ipstring, sizeof (ipstring), "%u.%u.%u.%u:%u", data[0], data[1], data[2], data[3], data[4] * 256 + data[5]); if (serverlist_consoleoutput && developer_networking.integer) Con_Printf("Requesting info from QuakeWorld server %s\n", ipstring); - // ignore the rest of the message if the serverlist is full - if( serverlist_cachecount == SERVERLIST_TOTALSIZE ) + + if( !NetConn_ClientParsePacket_ServerList_PrepareQuery( PROTOCOL_QUAKEWORLD, ipstring ) ) { break; - // also ignore it if we have already queried it (other master server response) - for( n = 0 ; n < serverlist_cachecount ; n++ ) - if( !strcmp( ipstring, serverlist_cache[ n ].info.cname ) ) - break; - if( n >= serverlist_cachecount ) - { - serverquerycount++; - - memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount])); - serverlist_cache[serverlist_cachecount].protocol = PROTOCOL_QUAKEWORLD; - // 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].query = SQS_QUERYING; - - ++serverlist_cachecount; } // move on to next address in packet @@ -1491,6 +1543,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat if ((s = SearchInfostring(string, "hostname" )) != NULL) strlcpy(info->name, s, sizeof (info->name));else info->name[0] = 0; info->protocol = 0; info->numplayers = 0; // updated below + info->numhumans = 0; // updated below if ((s = SearchInfostring(string, "maxclients" )) != NULL) info->maxplayers = atoi(s);else info->maxplayers = 0; if ((s = SearchInfostring(string, "gameversion" )) != NULL) info->gameversion = atoi(s);else info->gameversion = 0; @@ -1507,6 +1560,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat if (s >= string + length) break; info->numplayers++; + info->numhumans++; s++; } } @@ -1638,41 +1692,42 @@ void NetConn_QueryQueueFrame(void) return; } - // scan serverlist and issue queries as needed - serverlist_querysleep = true; + // scan serverlist and issue queries as needed + serverlist_querysleep = true; - timeouttime = realtime - net_slist_timeout.value; - for( index = 0, queries = 0 ; index < serverlist_cachecount && queries < maxqueries ; index++ ) + timeouttime = realtime - net_slist_timeout.value; + for( index = 0, queries = 0 ; index < serverlist_cachecount && queries < maxqueries ; index++ ) { serverlist_entry_t *entry = &serverlist_cache[ index ]; - if( entry->query != SQS_QUERYING ) + if( entry->query != SQS_QUERYING && entry->query != SQS_REFRESHING ) { continue; } - serverlist_querysleep = false; - if( entry->querycounter != 0 && entry->querytime > timeouttime ) + serverlist_querysleep = false; + if( entry->querycounter != 0 && entry->querytime > timeouttime ) { continue; } - if( entry->querycounter != (unsigned) net_slist_maxtries.integer ) + if( entry->querycounter != (unsigned) net_slist_maxtries.integer ) { - lhnetaddress_t address; + lhnetaddress_t address; int socket; LHNETADDRESS_FromString(&address, entry->info.cname, 0); - if (entry->protocol == PROTOCOL_QUAKEWORLD) + if (entry->protocol == PROTOCOL_QUAKEWORLD) { - for (socket = 0; socket < cl_numsockets ; socket++) + for (socket = 0; socket < cl_numsockets ; socket++) NetConn_WriteString(cl_sockets[socket], "\377\377\377\377status\n", &address); } else { - for (socket = 0; socket < cl_numsockets ; socket++) + for (socket = 0; socket < cl_numsockets ; socket++) NetConn_WriteString(cl_sockets[socket], "\377\377\377\377getinfo", &address); } + // update the entry fields entry->querytime = realtime; entry->querycounter++; @@ -1684,6 +1739,12 @@ void NetConn_QueryQueueFrame(void) } else { + // have we tried to refresh this server? + if( entry->query == SQS_REFRESHING ) { + // yes, so update the reply count (since its not responding anymore) + serverreplycount--; + ServerList_ViewList_Remove(entry); + } entry->query = SQS_TIMEDOUT; } } @@ -1723,7 +1784,7 @@ void NetConn_ClientFrame(void) while (cl_sockets[i] && (length = NetConn_Read(cl_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0) NetConn_ClientParsePacket(cl_sockets[i], readbuffer, length, &peeraddress); NetConn_QueryQueueFrame(); - if (cls.netcon && realtime > cls.netcon->timeout) + if (cls.netcon && realtime > cls.netcon->timeout && !sv.active) { Con_Print("Connection timed out\n"); CL_Disconnect(); @@ -2081,18 +2142,36 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat { int i; char *s = string + 5; + char *endpos = string + length + 1; // one behind the NUL, so adding strlen+1 will eventually reach it char password[64]; for (i = 0;*s > ' ';s++) if (i < (int)sizeof(password) - 1) password[i++] = *s; + if(*s <= ' ' && s != endpos) // skip leading ugly space + ++s; password[i] = 0; if (password[0] > ' ' && !strcmp(rcon_password.string, password)) { // looks like a legitimate rcon command with the correct password - Con_Printf("server received rcon command from %s:\n%s\n", host_client ? host_client->name : addressstring2, s); + char *s_ptr = s; + Con_Printf("server received rcon command from %s:\n", host_client ? host_client->name : addressstring2); + while(s_ptr != endpos) + { + size_t l = strlen(s_ptr); + if(l) + Con_Printf(" %s;", s_ptr); + s_ptr += l + 1; + } + Con_Printf("\n"); rcon_redirect = true; rcon_redirect_bufferpos = 0; - Cmd_ExecuteString(s, src_command); + while(s != endpos) + { + size_t l = strlen(s); + if(l) + Cmd_ExecuteString(s, src_command); + s += l + 1; + } rcon_redirect_buffer[rcon_redirect_bufferpos] = 0; rcon_redirect = false; // print resulting text to client @@ -2135,7 +2214,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat // protocol // (this protects more modern protocols against being used for // Quake packet flood Denial Of Service attacks) - if (length >= 5 && (i = BigLong(*((int *)data))) && (i & (~NETFLAG_LENGTH_MASK)) == (int)NETFLAG_CTL && (i & NETFLAG_LENGTH_MASK) == length && (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3)) + if (length >= 5 && (i = BigLong(*((int *)data))) && (i & (~NETFLAG_LENGTH_MASK)) == (int)NETFLAG_CTL && (i & NETFLAG_LENGTH_MASK) == length && (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_QUAKEDP || sv.protocol == PROTOCOL_NEHAHRAMOVIE || sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3 || sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3)) { int c; int protocolnumber; @@ -2543,6 +2622,16 @@ void Net_Stats_f(void) PrintStats(conn); } +void Net_Refresh_f(void) +{ + if (m_state != m_slist) { + Con_Print("Sending new requests to master servers\n"); + ServerList_QueryList(false, true, false, true); + Con_Print("Listening for replies...\n"); + } else + ServerList_QueryList(false, true, false, false); +} + void Net_Slist_f(void) { ServerList_ResetMasks(); @@ -2550,11 +2639,10 @@ void Net_Slist_f(void) serverlist_sortdescending = false; if (m_state != m_slist) { Con_Print("Sending requests to master servers\n"); - ServerList_QueryList(true, false); - serverlist_consoleoutput = true; + ServerList_QueryList(true, true, false, true); Con_Print("Listening for replies...\n"); } else - ServerList_QueryList(true, false); + ServerList_QueryList(true, true, false, false); } void Net_SlistQW_f(void) @@ -2564,11 +2652,11 @@ void Net_SlistQW_f(void) serverlist_sortdescending = false; if (m_state != m_slist) { Con_Print("Sending requests to master servers\n"); - ServerList_QueryList(false, true); + ServerList_QueryList(true, false, true, true); serverlist_consoleoutput = true; Con_Print("Listening for replies...\n"); } else - ServerList_QueryList(false, true); + ServerList_QueryList(true, false, true, false); } void NetConn_Init(void) @@ -2579,6 +2667,7 @@ void NetConn_Init(void) Cmd_AddCommand("net_stats", Net_Stats_f, "print network statistics"); Cmd_AddCommand("net_slist", Net_Slist_f, "query dp master servers and print all server information"); Cmd_AddCommand("net_slistqw", Net_SlistQW_f, "query qw master servers and print all server information"); + Cmd_AddCommand("net_refresh", Net_Refresh_f, "query dp master servers and refresh all server information"); Cmd_AddCommand("heartbeat", Net_Heartbeat_f, "send a heartbeat to the master server (updates your server information)"); Cvar_RegisterVariable(&net_slist_queriespersecond); Cvar_RegisterVariable(&net_slist_queriesperframe);