X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=netconn.c;h=6567d89c4163d9666ba23600bf66f4a949225a6b;hb=15368629f4f2f207e22af38b6fa29fdcbbe50982;hp=13f2649341dff59e9d94b5acaa80de15ca7d1fb9;hpb=71cde06e4bea4cbd75b4bc016befd8de1d6254c4;p=xonotic%2Fdarkplaces.git diff --git a/netconn.c b/netconn.c index 13f26493..6567d89c 100755 --- a/netconn.c +++ b/netconn.c @@ -49,22 +49,19 @@ 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", "satan.idsoftware.com", "default qwmaster server 1 (admin: idSoftware)"}, - {0, "sv_qwmasterextra2", "192.246.40.37:27000", "id Limbo (admin: id Software)"}, - {0, "sv_qwmasterextra3", "192.246.40.37:27002", "id CTF (admin: id Software)"}, - {0, "sv_qwmasterextra4", "192.246.40.37:27003", "id TeamFortress (admin: id Software)"}, - {0, "sv_qwmasterextra5", "192.246.40.37:27004", "id Miscilaneous (admin: id Software)"}, - {0, "sv_qwmasterextra6", "192.246.40.37:27006", "id Deathmatch Only (admin: id Software)"}, - {0, "sv_qwmasterextra7", "150.254.66.120:27000", "Poland's master server. (admin: unknown)"}, - {0, "sv_qwmasterextra8", "62.112.145.129:27000", "Ocrana master server. (admin: unknown)"}, - {0, "sv_qwmasterextra9", "master.edome.net", "edome master server. (admin: unknown)"}, - {0, "sv_qwmasterextra10", "qwmaster.barrysworld.com", "barrysworld master server. (admin: unknown)"}, - {0, "sv_qwmasterextra11", "qwmaster.ocrana.de:27000", "Ocrana2 master server. (admin: unknown)"}, - {0, "sv_qwmasterextra12", "213.221.174.165:27000", "unknown1 master server. (admin: unknown)"}, - {0, "sv_qwmasterextra13", "195.74.0.8", "unknown2 master server. (admin: unknown)"}, - {0, "sv_qwmasterextra14", "192.246.40.37", "unknown3 master server. (admin: unknown)"}, - {0, "sv_qwmasterextra15", "192.246.40.37:27006", "unknown4 master server. (admin: unknown)"}, - {0, "sv_qwmasterextra16", "204.182.161.2", "unknown5 master server. (admin: unknown)"}, + {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, NULL, NULL, NULL} }; @@ -86,6 +83,8 @@ static cvar_t net_slist_queriesperframe = {0, "net_slist_queriesperframe", "4", static cvar_t net_slist_timeout = {0, "net_slist_timeout", "4", "how long to listen for a server information response before giving up"}; static cvar_t net_slist_maxtries = {0, "net_slist_maxtries", "3", "how many times to ask the same server for information (more times gives better ping reports but takes longer)"}; +static cvar_t gameversion = {0, "gameversion", "0", "version of game data (mod-specific), when client and server gameversion mismatch in the server browser the server is shown as incompatible"}; + /* statistic counters */ static int packetsSent = 0; static int packetsReSent = 0; @@ -105,19 +104,19 @@ int serverquerycount = 0; int serverreplycount = 0; // this is only false if there are still servers left to query -int serverlist_querysleep = true; +static qboolean serverlist_querysleep = true; // this is pushed a second or two ahead of realtime whenever a master server // reply is received, to avoid issuing queries while master replies are still // flooding in (which would make a mess of the ping times) -double serverlist_querywaittime = 0; +static double serverlist_querywaittime = 0; static unsigned char sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; static unsigned char readbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; -int cl_numsockets; -lhnetsocket_t *cl_sockets[16]; -int sv_numsockets; -lhnetsocket_t *sv_sockets[16]; +static int cl_numsockets; +static lhnetsocket_t *cl_sockets[16]; +static int sv_numsockets; +static lhnetsocket_t *sv_sockets[16]; netconn_t *netconn_list = NULL; mempool_t *netconn_mempool = NULL; @@ -302,6 +301,10 @@ static void ServerList_ViewList_Insert( serverlist_entry_t *entry ) { int start, end, mid; + // reject incompatible servers + if (entry->info.gameversion != gameversion.integer) + return; + // FIXME: change this to be more readable (...) // now check whether it passes through the masks for( start = 0 ; serverlist_andmasks[start].active && start < SERVERLIST_ANDMASKCOUNT ; start++ ) @@ -391,7 +394,7 @@ static void _ServerList_Test(void) } #endif -void ServerList_QueryList(void) +void ServerList_QueryList(qboolean querydp, qboolean queryqw) { //masterquerytime = realtime; masterquerytime = Sys_DoubleTime(); @@ -405,7 +408,7 @@ void ServerList_QueryList(void) //_ServerList_Test(); - NetConn_QueryMasters(); + NetConn_QueryMasters(querydp, queryqw); } // rest @@ -1183,6 +1186,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat if ((s = SearchInfostring(string, "protocol" )) != NULL) info->protocol = atoi(s);else info->protocol = -1; if ((s = SearchInfostring(string, "clients" )) != NULL) info->numplayers = atoi(s);else info->numplayers = 0; if ((s = SearchInfostring(string, "sv_maxclients")) != NULL) info->maxplayers = atoi(s);else info->maxplayers = 0; + if ((s = SearchInfostring(string, "gameversion" )) != NULL) info->gameversion = atoi(s);else info->gameversion = 0; if (info->ping == 100000) serverreplycount++; @@ -1190,13 +1194,13 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat pingtime = (int)((Sys_DoubleTime() - serverlist_cache[n].querytime) * 1000.0 + 0.5); pingtime = bound(0, pingtime, 9999); // update the ping - info->ping = pingtime; + info->ping = (int)pingtime; // legacy/old stuff move it to the menu ASAP // build description strings for the things users care about dpsnprintf(serverlist_cache[n].line1, sizeof(serverlist_cache[n].line1), "^%c%5d^7 ^%c%3u^7/%3u %-65.65s", pingtime >= 300 ? '1' : (pingtime >= 200 ? '3' : '7'), (int)pingtime, ((info->numplayers > 0 && info->numplayers < info->maxplayers) ? (info->numplayers >= 4 ? '7' : '3') : '1'), info->numplayers, info->maxplayers, info->name); - dpsnprintf(serverlist_cache[n].line2, sizeof(serverlist_cache[n].line2), "^5%-21.21s %-19.19s %-17.17s %-20.20s", info->cname, info->game, info->mod, info->map); + dpsnprintf(serverlist_cache[n].line2, sizeof(serverlist_cache[n].line2), "^5%-21.21s %-19.19s ^%c%-17.17s^5 %-20.20s", info->cname, info->game, (info->gameversion != gameversion.integer) ? '1' : '5', info->mod, info->map); if( serverlist_cache[n].query == SQS_QUERIED ) { ServerList_ViewList_Remove( &serverlist_cache[n] ); } @@ -1261,7 +1265,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat length -= 2; masterreplycount++; if (serverlist_consoleoutput) - Con_Print("received QuakeWorld server list...\n"); + 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; @@ -1302,7 +1306,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat /* if (!strncmp(string, "ping", 4)) { - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Received ping from %s, sending ack\n", UDP_AddrToString(readaddr)); NetConn_WriteString(mysocket, "\377\377\377\377ack", peeraddress); return true; @@ -1375,13 +1379,14 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat } info = &serverlist_cache[n].info; + strlcpy(info->game, "QuakeWorld", sizeof(info->game));; if ((s = SearchInfostring(string, "*gamedir" )) != NULL) strlcpy(info->mod , s, sizeof (info->mod ));else info->mod[0] = 0; if ((s = SearchInfostring(string, "map" )) != NULL) strlcpy(info->map , s, sizeof (info->map ));else info->map[0] = 0; if ((s = SearchInfostring(string, "hostname" )) != NULL) strlcpy(info->name, s, sizeof (info->name));else info->name[0] = 0; - if ((s = SearchInfostring(string, "maxclients" )) != NULL) info->maxplayers = atoi(s);else info->maxplayers = 0; - strlcpy(info->game, "QuakeWorld", sizeof(info->game));; info->protocol = 0; info->numplayers = 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; // count active players on server // (we could gather more info, but we're just after the number) @@ -1406,13 +1411,13 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat pingtime = (int)((Sys_DoubleTime() - serverlist_cache[n].querytime) * 1000.0 + 0.5); pingtime = bound(0, pingtime, 9999); // update the ping - info->ping = pingtime; + info->ping = (int)pingtime; // legacy/old stuff move it to the menu ASAP // build description strings for the things users care about dpsnprintf(serverlist_cache[n].line1, sizeof(serverlist_cache[n].line1), "^%c%5d^7 ^%c%3u^7/%3u %-65.65s", pingtime >= 300 ? '1' : (pingtime >= 200 ? '3' : '7'), (int)pingtime, ((info->numplayers > 0 && info->numplayers < info->maxplayers) ? (info->numplayers >= 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 %-17.17s %-20.20s", info->cname, info->game, info->mod, info->map); + 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] ); } @@ -1451,7 +1456,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat switch (c) { case CCREP_ACCEPT: - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: received CCREP_ACCEPT from %s.\n", addressstring2); if (cls.connect_trying) { @@ -1469,14 +1474,14 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat } break; case CCREP_REJECT: - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: received CCREP_REJECT from %s.\n", addressstring2); cls.connect_trying = false; M_Update_Return_Reason((char *)data); break; #if 0 case CCREP_SERVER_INFO: - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: received CCREP_SERVER_INFO from %s.\n", addressstring2); if (cls.state != ca_dedicated) { @@ -1511,12 +1516,12 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat break; case CCREP_PLAYER_INFO: // we got a CCREP_PLAYER_INFO?? - //if (developer.integer) + //if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: received CCREP_PLAYER_INFO from %s.\n", addressstring2); break; case CCREP_RULE_INFO: // we got a CCREP_RULE_INFO?? - //if (developer.integer) + //if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: received CCREP_RULE_INFO from %s.\n", addressstring2); break; #endif @@ -1690,12 +1695,12 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg // TODO: we should add more information for the full status string length = dpsnprintf(out_msg, out_size, "\377\377\377\377%s\x0A" - "\\gamename\\%s\\modname\\%s\\sv_maxclients\\%d" - "\\clients\\%d\\mapname\\%s\\hostname\\%s""\\protocol\\%d" + "\\gamename\\%s\\modname\\%s\\gameversion\\%d\\sv_maxclients\\%d" + "\\clients\\%d\\mapname\\%s\\hostname\\%s\\protocol\\%d" "%s%s" "%s", fullstatus ? "statusResponse" : "infoResponse", - gamename, com_modname, svs.maxclients, + gamename, com_modname, gameversion.integer, svs.maxclients, nb_clients, sv.name, hostname.string, NET_PROTOCOL_VERSION, challenge ? "\\challenge\\" : "", challenge ? challenge : "", fullstatus ? "\n" : ""); @@ -1781,7 +1786,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat stringbuf[length] = 0; string = stringbuf; - if (developer.integer) + if (developer.integer >= 10) { LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true); Con_Printf("NetConn_ServerParsePacket: %s sent us a command:\n", addressstring2); @@ -1825,7 +1830,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat // check engine protocol if (strcmp(SearchInfostring(string, "protocol"), "darkplaces 3")) { - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: sending \"reject Wrong game protocol.\" to %s.\n", addressstring2); NetConn_WriteString(mysocket, "\377\377\377\377reject Wrong game protocol.", peeraddress); } @@ -1839,7 +1844,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat { // client is still trying to connect, // so we send a duplicate reply - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: sending duplicate accept to %s.\n", addressstring2); NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress); } @@ -1869,7 +1874,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat { // allocated connection LHNETADDRESS_ToString(peeraddress, conn->address, sizeof(conn->address), true); - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: sending \"accept\" to %s.\n", conn->address); NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress); // now set up the client @@ -1882,7 +1887,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat else { // server is full - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: sending \"reject Server is full.\" to %s.\n", addressstring2); NetConn_WriteString(mysocket, "\377\377\377\377reject Server is full.", peeraddress); } @@ -1902,7 +1907,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat if (NetConn_BuildStatusResponse(challenge, response, sizeof(response), false)) { - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Sending reply to master %s - %s\n", addressstring2, response); NetConn_WriteString(mysocket, response, peeraddress); } @@ -1918,7 +1923,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat if (NetConn_BuildStatusResponse(challenge, response, sizeof(response), true)) { - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Sending reply to client %s - %s\n", addressstring2, response); NetConn_WriteString(mysocket, response, peeraddress); } @@ -1967,7 +1972,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat /* if (!strncmp(string, "ping", 4)) { - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Received ping from %s, sending ack\n", UDP_AddrToString(readaddr)); NetConn_WriteString(mysocket, "\377\377\377\377ack", peeraddress); return true; @@ -1993,13 +1998,13 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat switch (c) { case CCREQ_CONNECT: - //if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: received CCREQ_CONNECT from %s.\n", addressstring2); if (length >= (int)strlen("QUAKE") + 1 + 1) { if (memcmp(data, "QUAKE", strlen("QUAKE") + 1) != 0 || (int)data[strlen("QUAKE") + 1] != NET_PROTOCOL_VERSION) { - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: sending CCREP_REJECT \"Incompatible version.\" to %s.\n", addressstring2); SZ_Clear(&net_message); // save space for the header, filled in later @@ -2023,7 +2028,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat { // client is still trying to connect, // so we send a duplicate reply - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: sending duplicate CCREP_ACCEPT to %s.\n", addressstring2); SZ_Clear(&net_message); // save space for the header, filled in later @@ -2057,7 +2062,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat // connect to the client // everything is allocated, just fill in the details strlcpy (conn->address, addressstring2, sizeof (conn->address)); - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: sending CCREP_ACCEPT to %s.\n", addressstring2); // send back the info about the server connection SZ_Clear(&net_message); @@ -2076,7 +2081,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat } else { - //if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: sending CCREP_REJECT \"Server is full.\" to %s.\n", addressstring2); // no room; try to let player know SZ_Clear(&net_message); @@ -2094,11 +2099,11 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat break; #if 0 case CCREQ_SERVER_INFO: - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: received CCREQ_SERVER_INFO from %s.\n", addressstring2); if (sv.active && !strcmp(MSG_ReadString(), "QUAKE")) { - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: sending CCREP_SERVER_INFO to %s.\n", addressstring2); SZ_Clear(&net_message); // save space for the header, filled in later @@ -2117,7 +2122,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat } break; case CCREQ_PLAYER_INFO: - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: received CCREQ_PLAYER_INFO from %s.\n", addressstring2); if (sv.active) { @@ -2148,7 +2153,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat } break; case CCREQ_RULE_INFO: - if (developer.integer) + if (developer.integer >= 10) Con_Printf("Datagram_ParseConnectionless: received CCREQ_RULE_INFO from %s.\n", addressstring2); if (sv.active) { @@ -2212,12 +2217,14 @@ void NetConn_ServerFrame(void) if (host_client->netconnection && realtime > host_client->netconnection->timeout && LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) != LHNETADDRESSTYPE_LOOP) { Con_Printf("Client \"%s\" connection timed out\n", host_client->name); + SV_VM_Begin(); SV_DropClient(false); + SV_VM_End(); } } } -void NetConn_QueryMasters(void) +void NetConn_QueryMasters(qboolean querydp, qboolean queryqw) { int i; int masternum; @@ -2233,48 +2240,70 @@ void NetConn_QueryMasters(void) // note this is IPv4-only, I doubt there are IPv6-only LANs out there LHNETADDRESS_FromString(&broadcastaddress, "255.255.255.255", 26000); - for (i = 0;i < cl_numsockets;i++) + if (querydp) { - if (cl_sockets[i]) + for (i = 0;i < cl_numsockets;i++) { - // search LAN for Quake servers - SZ_Clear(&net_message); - // save space for the header, filled in later - MSG_WriteLong(&net_message, 0); - MSG_WriteByte(&net_message, CCREQ_SERVER_INFO); - MSG_WriteString(&net_message, "QUAKE"); - MSG_WriteByte(&net_message, NET_PROTOCOL_VERSION); - *((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK)); - NetConn_Write(cl_sockets[i], net_message.data, net_message.cursize, &broadcastaddress); - SZ_Clear(&net_message); - - // search LAN for DarkPlaces servers - NetConn_WriteString(cl_sockets[i], "\377\377\377\377getinfo", &broadcastaddress); - - // build the getservers message to send to the dpmaster master servers - dpsnprintf(request, sizeof(request), "\377\377\377\377getservers %s %u empty full\x0A", gamename, NET_PROTOCOL_VERSION); - - // search internet - for (masternum = 0;sv_masters[masternum].name;masternum++) + if (cl_sockets[i]) { - if (sv_masters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, DPMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i]))) + // search LAN for Quake servers + SZ_Clear(&net_message); + // save space for the header, filled in later + MSG_WriteLong(&net_message, 0); + MSG_WriteByte(&net_message, CCREQ_SERVER_INFO); + MSG_WriteString(&net_message, "QUAKE"); + MSG_WriteByte(&net_message, NET_PROTOCOL_VERSION); + *((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK)); + NetConn_Write(cl_sockets[i], net_message.data, net_message.cursize, &broadcastaddress); + SZ_Clear(&net_message); + + // search LAN for DarkPlaces servers + NetConn_WriteString(cl_sockets[i], "\377\377\377\377getinfo", &broadcastaddress); + + // build the getservers message to send to the dpmaster master servers + dpsnprintf(request, sizeof(request), "\377\377\377\377getservers %s %u empty full\x0A", gamename, NET_PROTOCOL_VERSION); + + // search internet + for (masternum = 0;sv_masters[masternum].name;masternum++) { - masterquerycount++; - NetConn_WriteString(cl_sockets[i], request, &masteraddress); + if (sv_masters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, DPMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i]))) + { + masterquerycount++; + NetConn_WriteString(cl_sockets[i], request, &masteraddress); + } } } + } + } - // build the getservers message to send to the qwmaster master servers - // note this has no -1 prefix, and the trailing nul byte is sent - dpsnprintf(request, sizeof(request), "c\n"); - - // search internet - for (masternum = 0;sv_qwmasters[masternum].name;masternum++) + // only query QuakeWorld servers when the user wants to + if (queryqw) + { + for (i = 0;i < cl_numsockets;i++) + { + if (cl_sockets[i]) { - if (sv_qwmasters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_qwmasters[masternum].string, QWMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i]))) + // search LAN for QuakeWorld servers + NetConn_WriteString(cl_sockets[i], "\377\377\377\377status\n", &broadcastaddress); + + // build the getservers message to send to the qwmaster master servers + // note this has no -1 prefix, and the trailing nul byte is sent + dpsnprintf(request, sizeof(request), "c\n"); + + // search internet + for (masternum = 0;sv_qwmasters[masternum].name;masternum++) { - masterquerycount++; - NetConn_Write(cl_sockets[i], request, 7, &masteraddress); + if (sv_qwmasters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_qwmasters[masternum].string, QWMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i]))) + { + if (m_state != m_slist) + { + char lookupstring[128]; + LHNETADDRESS_ToString(&masteraddress, lookupstring, sizeof(lookupstring), true); + Con_Printf("Querying master %s (resolved from %s)\n", lookupstring, sv_qwmasters[masternum].string); + } + masterquerycount++; + NetConn_Write(cl_sockets[i], request, 7, &masteraddress); + } } } } @@ -2357,11 +2386,25 @@ void Net_Slist_f(void) serverlist_sortdescending = false; if (m_state != m_slist) { Con_Print("Sending requests to master servers\n"); - ServerList_QueryList(); + ServerList_QueryList(true, false); + serverlist_consoleoutput = true; + Con_Print("Listening for replies...\n"); + } else + ServerList_QueryList(true, false); +} + +void Net_SlistQW_f(void) +{ + ServerList_ResetMasks(); + serverlist_sortbyfield = SLIF_PING; + serverlist_sortdescending = false; + if (m_state != m_slist) { + Con_Print("Sending requests to master servers\n"); + ServerList_QueryList(false, true); serverlist_consoleoutput = true; Con_Print("Listening for replies...\n"); } else - ServerList_QueryList(); + ServerList_QueryList(false, true); } void NetConn_Init(void) @@ -2370,7 +2413,8 @@ void NetConn_Init(void) lhnetaddress_t tempaddress; netconn_mempool = Mem_AllocPool("network connections", 0, NULL); Cmd_AddCommand("net_stats", Net_Stats_f, "print network statistics"); - Cmd_AddCommand("net_slist", Net_Slist_f, "query master series and print all server information"); + 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("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); @@ -2391,6 +2435,7 @@ void NetConn_Init(void) Cvar_RegisterVariable(&sv_heartbeatperiod); for (i = 0;sv_masters[i].name;i++) Cvar_RegisterVariable(&sv_masters[i]); + Cvar_RegisterVariable(&gameversion); // COMMANDLINEOPTION: Server: -ip sets the ip address of this machine for purposes of networking (default 0.0.0.0 also known as INADDR_ANY), use only if you have multiple network adapters and need to choose one specifically. if ((i = COM_CheckParm("-ip")) && i + 1 < com_argc) {