diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2011-04-26 23:45:01 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:18:07 +0000 |
| commit | 221e729a3b69381fed843749c9728f827217aa90 (patch) | |
| tree | 2a8978dea620fb7a7a366657ecb5549ff6f62842 /src/client | |
| parent | 06006eb6930de74c577c87daf6a0f7917e22d578 (diff) | |
* Remove the protocol argument to globalServers, always use PROTOCOL_VERSION
- This fixes the server list, thanks to Oopss for pointing out it was broken
* Remove debug_protocol
* Revert some getservers stuff accidentally merged from ioq3
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/cl_main.c | 45 |
1 files changed, 9 insertions, 36 deletions
diff --git a/src/client/cl_main.c b/src/client/cl_main.c index 5166804f..10bc313f 100644 --- a/src/client/cl_main.c +++ b/src/client/cl_main.c @@ -2453,7 +2453,7 @@ CL_ServersResponsePacket =================== */ void CL_ServersResponsePacket( const netadr_t* from, msg_t *msg, qboolean extended ) { - int i, j, count, total; + int i, count, total; netadr_t addresses[MAX_SERVERSPERPACKET]; int numservers; byte* buffptr; @@ -2570,18 +2570,6 @@ void CL_ServersResponsePacket( const netadr_t* from, msg_t *msg, qboolean extend // build net address serverInfo_t *server = &cls.globalServers[count]; - // Tequila: It's possible to have sent many master server requests. Then - // we may receive many times the same addresses from the master server. - // We just avoid to add a server if it is still in the global servers list. - for (j = 0; j < count; j++) - { - if (NET_CompareAdr(cls.globalServers[j].adr, addresses[i])) - break; - } - - if (j < count) - continue; - CL_InitServerInfo( server, &addresses[i] ); Q_strncpyz( server->label, label, sizeof( server->label ) ); // advance to next slot @@ -4001,9 +3989,9 @@ void CL_GlobalServers_f( void ) { int count, i, masterNum; char command[1024], *masteraddress; - if ((count = Cmd_Argc()) < 3 || (masterNum = atoi(Cmd_Argv(1))) < 0 || masterNum > MAX_MASTER_SERVERS - 1) + if ((count = Cmd_Argc()) < 2 || (masterNum = atoi(Cmd_Argv(1))) < 0 || masterNum > MAX_MASTER_SERVERS - 1) { - Com_Printf("usage: globalservers <master# 0-%d> <protocol> [keywords]\n", MAX_MASTER_SERVERS - 1); + Com_Printf("usage: globalservers <master# 0-%d> [keywords]\n", MAX_MASTER_SERVERS - 1); return; } @@ -4034,27 +4022,12 @@ void CL_GlobalServers_f( void ) { cls.numglobalservers = -1; cls.pingUpdateSource = AS_GLOBAL; - // Use the extended query for IPv6 masters - if (to.type == NA_IP6 || to.type == NA_MULTICAST6) - { - int v4enabled = Cvar_VariableIntegerValue("net_enabled") & NET_ENABLEV4; - - if(v4enabled) - { - Com_sprintf(command, sizeof(command), "getserversExt %s %s ipv6", - cl_gamename->string, Cmd_Argv(2)); - } - else - { - Com_sprintf(command, sizeof(command), "getserversExt %s %s", - cl_gamename->string, Cmd_Argv(2)); - } - - // TODO: test if we only have an IPv6 connection. If it's the case, - // request IPv6 servers only by appending " ipv6" to the command - } - else - Com_sprintf(command, sizeof(command), "getservers %s", Cmd_Argv(2)); + Com_sprintf( command, sizeof( command ), "getserversExt %s %d", + cl_gamename->string, PROTOCOL_VERSION ); + // TODO: test if we only have IPv4/IPv6, if so request only the relevant + // servers with getserversExt %s %d ipvX + // not that big a deal since the extra servers won't respond to getinfo + // anyway. for (i=3; i < count; i++) { |