X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.c;h=2c7f0cae03e872acb0a90df28fb49e6c6fa16599;hp=90d6d40dab7487f9f800a54fce2ae47e98cad948;hb=9e63b852381f1fc228dedc8eed053b52d4a5eac8;hpb=ae1534f3ea57ed5165d1103ad4bba9bc2fa9272f diff --git a/netconn.c b/netconn.c index 90d6d40d..2c7f0cae 100755 --- a/netconn.c +++ b/netconn.c @@ -34,8 +34,8 @@ static cvar_t sv_masters [] = {CVAR_SAVE, "sv_master2", ""}, {CVAR_SAVE, "sv_master3", ""}, {CVAR_SAVE, "sv_master4", ""}, - {0, "sv_masterextra1", "198.88.152.4"}, - {0, "sv_masterextra2", "68.102.242.12"}, + {0, "sv_masterextra1", "ghdigital.com"}, + {0, "sv_masterextra2", "dpmaster.deathmask.net"}, {0, NULL, NULL} }; @@ -49,12 +49,8 @@ cvar_t net_connecttimeout = {0, "net_connecttimeout","10"}; cvar_t hostname = {CVAR_SAVE, "hostname", "UNNAMED"}; cvar_t developer_networking = {0, "developer_networking", "0"}; -cvar_t cl_fakelocalping_min = {0, "cl_fakelocalping_min","0"}; -cvar_t cl_fakelocalping_max = {0, "cl_fakelocalping_max","0"}; -static cvar_t cl_fakepacketloss_receive = {0, "cl_fakepacketloss_receive","0"}; -static cvar_t cl_fakepacketloss_send = {0, "cl_fakepacketloss_send","0"}; -static cvar_t sv_fakepacketloss_receive = {0, "sv_fakepacketloss_receive","0"}; -static cvar_t sv_fakepacketloss_send = {0, "sv_fakepacketloss_send","0"}; +cvar_t cl_netlocalping = {0, "cl_netlocalping","0"}; +static cvar_t cl_netpacketloss = {0, "cl_netpacketloss","0"}; /* statistic counters */ @@ -69,11 +65,17 @@ static int unreliableMessagesReceived = 0; static int reliableMessagesSent = 0; static int reliableMessagesReceived = 0; +double masterquerytime = -1000; +int masterquerycount = 0; +int masterreplycount = 0; +int serverquerycount = 0; +int serverreplycount = 0; + int hostCacheCount = 0; hostcache_t hostcache[HOSTCACHESIZE]; -static qbyte sendbuffer[NET_MAXMESSAGE]; -static qbyte readbuffer[NET_MAXMESSAGE]; +static qbyte sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; +static qbyte readbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; int cl_numsockets; lhnetsocket_t *cl_sockets[16]; @@ -84,24 +86,17 @@ netconn_t *netconn_list = NULL; mempool_t *netconn_mempool = NULL; cvar_t cl_netport = {0, "cl_port", "0"}; -cvar_t cl_netaddress = {0, "cl_netaddress", "0.0.0.0"}; -cvar_t cl_netaddress_ipv6 = {0, "cl_netaddress_ipv6", "[0:0:0:0:0:0:0:0]:0"}; - cvar_t sv_netport = {0, "port", "26000"}; -cvar_t sv_netaddress = {0, "sv_netaddress", "0.0.0.0"}; -cvar_t sv_netaddress_ipv6 = {0, "sv_netaddress_ipv6", "[0:0:0:0:0:0:0:0]:26000"}; +cvar_t net_address = {0, "net_address", "0.0.0.0"}; +//cvar_t net_netaddress_ipv6 = {0, "net_address_ipv6", "[0:0:0:0:0:0:0:0]"}; int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddress_t *peeraddress) { int length = LHNET_Read(mysocket, data, maxlength, peeraddress); int i; - if (cl_fakepacketloss_receive.integer) + if (cl_netpacketloss.integer) for (i = 0;i < cl_numsockets;i++) - if (cl_sockets[i] == mysocket && (rand() % 100) < cl_fakepacketloss_receive.integer) - return 0; - if (sv_fakepacketloss_receive.integer) - for (i = 0;i < cl_numsockets;i++) - if (sv_sockets[i] == mysocket && (rand() % 100) < sv_fakepacketloss_receive.integer) + if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss.integer) return 0; if (developer_networking.integer && length != 0) { @@ -123,13 +118,9 @@ int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const l { int ret; int i; - if (cl_fakepacketloss_send.integer) + if (cl_netpacketloss.integer) for (i = 0;i < cl_numsockets;i++) - if (cl_sockets[i] == mysocket && (rand() % 100) < cl_fakepacketloss_send.integer) - return length; - if (sv_fakepacketloss_send.integer) - for (i = 0;i < cl_numsockets;i++) - if (sv_sockets[i] == mysocket && (rand() % 100) < sv_fakepacketloss_send.integer) + if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss.integer) return length; ret = LHNET_Write(mysocket, data, length, peeraddress); if (developer_networking.integer) @@ -160,8 +151,8 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data) if (data->cursize == 0) Sys_Error("Datagram_SendMessage: zero length message\n"); - if (data->cursize > NET_MAXMESSAGE) - Sys_Error("Datagram_SendMessage: message too big %u\n", data->cursize); + if (data->cursize > (int)sizeof(conn->sendMessage)) + Sys_Error("Datagram_SendMessage: message too big (%u > %u)\n", data->cursize, sizeof(conn->sendMessage)); if (conn->canSend == false) Sys_Error("SendMessage: called with canSend == false\n"); @@ -186,7 +177,7 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data) header = (void *)sendbuffer; header[0] = BigLong(packetLen | (NETFLAG_DATA | eom)); header[1] = BigLong(conn->sendSequence); - memcpy(sendbuffer + 8, conn->sendMessage, dataLen); + memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen); conn->sendSequence++; conn->canSend = false; @@ -225,7 +216,7 @@ static void NetConn_SendMessageNext(netconn_t *conn) header = (void *)sendbuffer; header[0] = BigLong(packetLen | (NETFLAG_DATA | eom)); header[1] = BigLong(conn->sendSequence); - memcpy(sendbuffer + 8, conn->sendMessage, dataLen); + memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen); conn->sendSequence++; conn->sendNext = false; @@ -263,7 +254,7 @@ static void NetConn_ReSendMessage(netconn_t *conn) header = (void *)sendbuffer; header[0] = BigLong(packetLen | (NETFLAG_DATA | eom)); header[1] = BigLong(conn->sendSequence - 1); - memcpy(sendbuffer + 8, conn->sendMessage, dataLen); + memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen); conn->sendNext = false; @@ -285,20 +276,20 @@ int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data) int packetLen; int *header; -#ifdef DEBUG + packetLen = NET_HEADERSIZE + data->cursize; + +//#ifdef DEBUG if (data->cursize == 0) Sys_Error("Datagram_SendUnreliableMessage: zero length message\n"); - if (data->cursize > MAX_DATAGRAM) + if (packetLen > (int)sizeof(sendbuffer)) Sys_Error("Datagram_SendUnreliableMessage: message too big %u\n", data->cursize); -#endif - - packetLen = NET_HEADERSIZE + data->cursize; +//#endif header = (void *)sendbuffer; header[0] = BigLong(packetLen | NETFLAG_UNRELIABLE); header[1] = BigLong(conn->unreliableSendSequence); - memcpy(sendbuffer + 8, data->data, data->cursize); + memcpy(sendbuffer + NET_HEADERSIZE, data->data, data->cursize); conn->unreliableSendSequence++; @@ -348,9 +339,9 @@ void NetConn_OpenClientPorts(void) if (cl_netport.integer != port) Cvar_SetValueQuick(&cl_netport, port); Con_Printf("Client using port %i\n", port); - NetConn_OpenClientPort("local", port); - NetConn_OpenClientPort(cl_netaddress.string, port); - NetConn_OpenClientPort(cl_netaddress_ipv6.string, port); + NetConn_OpenClientPort("local:2", 0); + NetConn_OpenClientPort(net_address.string, port); + //NetConn_OpenClientPort(net_address_ipv6.string, port); } void NetConn_CloseServerPorts(void) @@ -394,11 +385,11 @@ void NetConn_OpenServerPorts(int opennetports) if (sv_netport.integer != port) Cvar_SetValueQuick(&sv_netport, port); if (cls.state != ca_dedicated) - NetConn_OpenServerPort("local", port); + NetConn_OpenServerPort("local:1", 0); if (opennetports) { - NetConn_OpenServerPort(sv_netaddress.string, port); - NetConn_OpenServerPort(sv_netaddress_ipv6.string, port); + NetConn_OpenServerPort(net_address.string, port); + //NetConn_OpenServerPort(net_address_ipv6.string, port); } if (sv_numsockets == 0) Host_Error("NetConn_OpenServerPorts: unable to open any ports!\n"); @@ -428,6 +419,11 @@ netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress) conn = Mem_Alloc(netconn_mempool, sizeof(*conn)); conn->mysocket = mysocket; conn->peeraddress = *peeraddress; + // updated by receiving "rate" command from client + conn->rate = NET_MINRATE; + // no limits for local player + if (LHNETADDRESS_GetAddressType(peeraddress) == LHNETADDRESSTYPE_LOOP) + conn->rate = 1000000000; conn->canSend = true; conn->connecttime = realtime; conn->lastMessageTime = realtime; @@ -469,17 +465,17 @@ static int clientport2 = -1; static int hostport = -1; static void NetConn_UpdateServerStuff(void) { - if (clientport2 != cl_netport.integer) - { - clientport2 = cl_netport.integer; - if (cls.state == ca_connected) - Con_Printf("Changing \"cl_port\" will not take effect until you reconnect.\n"); - } if (cls.state != ca_dedicated) { - if (cls.state == ca_disconnected && clientport != cl_netport.integer) + if (clientport2 != cl_netport.integer) + { + clientport2 = cl_netport.integer; + if (cls.state == ca_connected) + Con_Print("Changing \"cl_port\" will not take effect until you reconnect.\n"); + } + if (cls.state == ca_disconnected && clientport != clientport2) { - clientport = cl_netport.integer; + clientport = clientport2; NetConn_CloseClientPorts(); } if (cl_numsockets == 0) @@ -490,7 +486,7 @@ static void NetConn_UpdateServerStuff(void) { hostport = sv_netport.integer; if (sv.active) - Con_Printf("Changing \"port\" will not take effect until \"map\" command is executed.\n"); + Con_Print("Changing \"port\" will not take effect until \"map\" command is executed.\n"); } } @@ -535,7 +531,7 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) } } else - Con_DPrintf("Got a stale datagram\n"); + Con_DPrint("Got a stale datagram\n"); return 1; } else if (flags & NETFLAG_ACK) @@ -546,7 +542,7 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) { conn->ackSequence++; if (conn->ackSequence != conn->sendSequence) - Con_DPrintf("ack sequencing error\n"); + Con_DPrint("ack sequencing error\n"); conn->lastMessageTime = realtime; conn->timeout = realtime + net_messagetimeout.value; conn->sendMessageLength -= MAX_PACKETFRAGMENT; @@ -563,10 +559,10 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) } } else - Con_DPrintf("Duplicate ACK received\n"); + Con_DPrint("Duplicate ACK received\n"); } else - Con_DPrintf("Stale ACK received\n"); + Con_DPrint("Stale ACK received\n"); return 1; } else if (flags & NETFLAG_DATA) @@ -607,16 +603,19 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress) { + cls.connect_trying = false; + M_Update_Return_Reason(""); + // the connection request succeeded, stop current connection and set up a new connection + CL_Disconnect(); cls.netcon = NetConn_Open(mysocket, peeraddress); Con_Printf("Connection accepted to %s\n", cls.netcon->address); key_dest = key_game; m_state = m_none; - cls.connect_trying = false; 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(); - Host_Reconnect_f(); + SCR_BeginLoadingPlaque(); } int NetConn_IsLocalGame(void) @@ -663,22 +662,25 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, { LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true); Con_Printf("\"%s\" received, sending connect request back to %s\n", string, addressstring2); + M_Update_Return_Reason("Got challenge response"); NetConn_WriteString(mysocket, va("\377\377\377\377connect\\protocol\\darkplaces 3\\challenge\\%s", string + 10), peeraddress); return true; } if (length == 6 && !memcmp(string, "accept", 6) && cls.connect_trying) { + M_Update_Return_Reason("Accepted"); NetConn_ConnectionEstablished(mysocket, peeraddress); return true; } if (length > 7 && !memcmp(string, "reject ", 7) && cls.connect_trying) { + char rejectreason[32]; cls.connect_trying = false; string += 7; - length = max(length - 7, (int)sizeof(m_return_reason) - 1); - memcpy(m_return_reason, string, length); - m_return_reason[length] = 0; - Con_Printf("%s\n", m_return_reason); + length = max(length - 7, (int)sizeof(rejectreason) - 1); + memcpy(rejectreason, string, length); + rejectreason[length] = 0; + M_Update_Return_Reason(rejectreason); return true; } if (length >= 13 && !memcmp(string, "infoResponse\x0A", 13)) @@ -690,110 +692,129 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, string += 13; // hostcache only uses text addresses LHNETADDRESS_ToString(peeraddress, cname, sizeof(cname), true); - // search the cache for this server - for (n = 0; n < hostCacheCount; n++) - if (!strcmp(cname, hostcache[n].cname)) - break; - // add it or update it - if (n == hostCacheCount) - { - // if cache is full replace highest ping server (the list is - // kept sorted so this is always the last, and if this server - // is good it will be sorted into an early part of the list) - if (hostCacheCount >= HOSTCACHESIZE) - n = hostCacheCount - 1; - else - hostCacheCount++; - } - if ((s = SearchInfostring(string, "gamename" )) != NULL) strncpy(game, s, sizeof(game) - 1);else game[0] = 0; - if ((s = SearchInfostring(string, "modname" )) != NULL) strncpy(mod , s, sizeof(mod ) - 1);else mod[0] = 0; - if ((s = SearchInfostring(string, "mapname" )) != NULL) strncpy(map , s, sizeof(map ) - 1);else map[0] = 0; - if ((s = SearchInfostring(string, "hostname" )) != NULL) strncpy(name, s, sizeof(name) - 1);else name[0] = 0; + if ((s = SearchInfostring(string, "gamename" )) != NULL) strlcpy(game, s, sizeof (game));else game[0] = 0; + if ((s = SearchInfostring(string, "modname" )) != NULL) strlcpy(mod , s, sizeof (mod ));else mod[0] = 0; + if ((s = SearchInfostring(string, "mapname" )) != NULL) strlcpy(map , s, sizeof (map ));else map[0] = 0; + if ((s = SearchInfostring(string, "hostname" )) != NULL) strlcpy(name, s, sizeof (name));else name[0] = 0; if ((s = SearchInfostring(string, "protocol" )) != NULL) c = atoi(s);else c = -1; if ((s = SearchInfostring(string, "clients" )) != NULL) users = atoi(s);else users = 0; if ((s = SearchInfostring(string, "sv_maxclients")) != NULL) maxusers = atoi(s);else maxusers = 0; - pingtime = 9999; - for (i = 0;i < HOSTCACHESIZE;i++) - if (!LHNETADDRESS_Compare(peeraddress, &pingcache[i].peeraddress)) - pingtime = (int)(realtime - pingcache[i].senttime); - pingtime = bound(0, pingtime, 9999); - memset(&hostcache[n], 0, sizeof(hostcache[n])); - // store the data the engine cares about (address and ping) - strcpy(hostcache[n].cname, cname); - hostcache[n].ping = pingtime; - // build description strings for the things users care about - snprintf(hostcache[n].line1, sizeof(hostcache[n].line1), "%5d%c%3u/%3u %-65.65s", (int)pingtime, c != NET_PROTOCOL_VERSION ? '*' : ' ', users, maxusers, name); - snprintf(hostcache[n].line2, sizeof(hostcache[n].line2), "%-21.21s %-19.19s %-17.17s %-20.20s", cname, game, mod, map); - // if ping is especially high, display it as such - if (pingtime >= 300) - { - // orange numbers (lower block) - for (i = 0;i < 5;i++) - if (hostcache[n].line1[i] != ' ') - hostcache[n].line1[i] += 128; - } - else if (pingtime >= 200) - { - // yellow numbers (in upper block) - for (i = 0;i < 5;i++) - if (hostcache[n].line1[i] != ' ') - hostcache[n].line1[i] -= 30; - } - // if not in the slist menu we should print the server to console - if (m_state != m_slist) - Con_Printf("%s\n%s\n", hostcache[n].line1, hostcache[n].line2); - // and finally, re-sort the list - for (i = 0;i < hostCacheCount;i++) + // search the cache for this server and update it + for (n = 0; n < hostCacheCount; n++) { - for (j = i + 1;j < hostCacheCount;j++) + if (!strcmp(cname, hostcache[n].cname)) { - //if (strcmp(hostcache[j].name, hostcache[i].name) < 0) - if (hostcache[i].ping > hostcache[j].ping) + if (hostcache[n].ping == 100000) + serverreplycount++; + pingtime = (int)((realtime - hostcache[n].querytime) * 1000.0); + pingtime = bound(0, pingtime, 9999); + // update the ping + hostcache[n].ping = pingtime; + // build description strings for the things users care about + snprintf(hostcache[n].line1, sizeof(hostcache[n].line1), "%5d%c%3u/%3u %-65.65s", (int)pingtime, c != NET_PROTOCOL_VERSION ? '*' : ' ', users, maxusers, name); + snprintf(hostcache[n].line2, sizeof(hostcache[n].line2), "%-21.21s %-19.19s %-17.17s %-20.20s", cname, game, mod, map); + // if ping is especially high, display it as such + if (pingtime >= 300) + { + // orange numbers (lower block) + for (i = 0;i < 5;i++) + if (hostcache[n].line1[i] != ' ') + hostcache[n].line1[i] += 128; + } + else if (pingtime >= 200) { - memcpy(&temp, &hostcache[j], sizeof(hostcache_t)); - memcpy(&hostcache[j], &hostcache[i], sizeof(hostcache_t)); - memcpy(&hostcache[i], &temp, sizeof(hostcache_t)); + // yellow numbers (in upper block) + for (i = 0;i < 5;i++) + if (hostcache[n].line1[i] != ' ') + hostcache[n].line1[i] -= 30; } + // if not in the slist menu we should print the server to console + if (m_state != m_slist) + Con_Printf("%s\n%s\n", hostcache[n].line1, hostcache[n].line2); + // and finally, re-sort the list + for (i = 0;i < hostCacheCount;i++) + { + for (j = i + 1;j < hostCacheCount;j++) + { + //if (strcmp(hostcache[j].name, hostcache[i].name) < 0) + if (hostcache[i].ping > hostcache[j].ping) + { + memcpy(&temp, &hostcache[j], sizeof(hostcache_t)); + memcpy(&hostcache[j], &hostcache[i], sizeof(hostcache_t)); + memcpy(&hostcache[i], &temp, sizeof(hostcache_t)); + } + } + } + break; } } return true; } if (!strncmp(string, "getserversResponse\\", 19) && hostCacheCount < HOSTCACHESIZE) { - int i, best; - double besttime; + int i, n, j; + hostcache_t temp; // Extract the IP addresses data += 18; length -= 18; + masterreplycount++; + if (m_state != m_slist) + Con_Print("received 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) { - sprintf(ipstring, "%u.%u.%u.%u:%u", data[1], data[2], data[3], data[4], (data[5] << 8) | data[6]); + snprintf (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); LHNETADDRESS_FromString(&svaddress, ipstring, 0); NetConn_WriteString(mysocket, "\377\377\377\377getinfo", &svaddress); - // replace oldest or matching entry in ping cache - // we scan this later when getting a reply to see how long it took - besttime = realtime; - best = 0; - for (i = 0;i < HOSTCACHESIZE;i++) + + + // add to slist (hostCache) + // search the cache for this server + for (n = 0; n < hostCacheCount; n++) + if (!strcmp(ipstring, hostcache[n].cname)) + break; + // add it or update it + if (n == hostCacheCount) { - if (!LHNETADDRESS_Compare(&svaddress, &pingcache[i].peeraddress)) + // if cache is full replace highest ping server (the list is + // kept sorted so this is always the last, and if this server + // is good it will be sorted into an early part of the list) + if (hostCacheCount >= HOSTCACHESIZE) + n = hostCacheCount - 1; + else { - best = i; - break; + serverquerycount++; + hostCacheCount++; } - if (besttime > pingcache[i].senttime) + } + memset(&hostcache[n], 0, sizeof(hostcache[n])); + // store the data the engine cares about (address and ping) + strlcpy (hostcache[n].cname, ipstring, sizeof (hostcache[n].cname)); + hostcache[n].ping = 100000; + hostcache[n].querytime = realtime; + // build description strings for the things users care about + strlcpy (hostcache[n].line1, "?", sizeof (hostcache[n].line1)); + strlcpy (hostcache[n].line2, ipstring, sizeof (hostcache[n].line2)); + // if not in the slist menu we should print the server to console + if (m_state != m_slist) + Con_Printf("querying %s\n", ipstring); + // and finally, re-sort the list + for (i = 0;i < hostCacheCount;i++) + { + for (j = i + 1;j < hostCacheCount;j++) { - besttime = pingcache[i].senttime; - best = i; - // if ping cache isn't full yet we can skip out early - if (!besttime) - break; + //if (strcmp(hostcache[j].name, hostcache[i].name) < 0) + if (hostcache[i].ping > hostcache[j].ping) + { + memcpy(&temp, &hostcache[j], sizeof(hostcache_t)); + memcpy(&hostcache[j], &hostcache[i], sizeof(hostcache_t)); + memcpy(&hostcache[i], &temp, sizeof(hostcache_t)); + } } } - pingcache[best].peeraddress = svaddress; - pingcache[best].senttime = realtime; + + // move on to next address in packet data += 7; length -= 7; @@ -838,14 +859,15 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, length -= 4; LHNETADDRESS_SetPort(&clientportaddress, port); } + M_Update_Return_Reason("Accepted"); NetConn_ConnectionEstablished(mysocket, &clientportaddress); } break; case CCREP_REJECT: if (developer.integer) Con_Printf("Datagram_ParseConnectionless: received CCREP_REJECT from %s.\n", addressstring2); - Con_Printf("%s\n", data); - strncpy(m_return_reason, data, sizeof(m_return_reason) - 1); + cls.connect_trying = false; + M_Update_Return_Reason(data); break; #if 0 case CCREP_SERVER_INFO: @@ -867,20 +889,18 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, { hostCacheCount++; memset(&hostcache[n], 0, sizeof(hostcache[n])); - strcpy(hostcache[n].name, MSG_ReadString()); - strcpy(hostcache[n].map, MSG_ReadString()); + strlcpy (hostcache[n].name, MSG_ReadString(), sizeof (hostcache[n].name)); + strlcpy (hostcache[n].map, MSG_ReadString(), sizeof (hostcache[n].map)); hostcache[n].users = MSG_ReadByte(); hostcache[n].maxusers = MSG_ReadByte(); c = MSG_ReadByte(); if (c != NET_PROTOCOL_VERSION) { - strncpy(hostcache[n].cname, hostcache[n].name, sizeof(hostcache[n].cname) - 1); - hostcache[n].cname[sizeof(hostcache[n].cname) - 1] = 0; + strlcpy (hostcache[n].cname, hostcache[n].name, sizeof (hostcache[n].cname)); strcpy(hostcache[n].name, "*"); - strncat(hostcache[n].name, hostcache[n].cname, sizeof(hostcache[n].name) - 1); - hostcache[n].name[sizeof(hostcache[n].name) - 1] = 0; + strlcat (hostcache[n].name, hostcache[n].cname, sizeof(hostcache[n].name)); } - strcpy(hostcache[n].cname, cname); + strlcpy (hostcache[n].cname, cname, sizeof (hostcache[n].cname)); } } break; @@ -919,13 +939,9 @@ void NetConn_ClientFrame(void) if (cls.connect_remainingtries == 0) { cls.connect_trying = false; - Host_Error("Connect failed\n"); + M_Update_Return_Reason("Connect: Failed"); return; } - if (cls.connect_nextsendtime) - Con_Printf("Still trying...\n"); - else - Con_Printf("Trying...\n"); cls.connect_nextsendtime = realtime + 1; cls.connect_remainingtries--; // try challenge first (newer server) @@ -946,8 +962,9 @@ void NetConn_ClientFrame(void) NetConn_ClientParsePacket(cl_sockets[i], readbuffer, length, &peeraddress); if (cls.netcon && realtime > cls.netcon->timeout) { - Con_Printf("Connection timed out\n"); + Con_Print("Connection timed out\n"); CL_Disconnect(); + Host_ShutdownServer (false); } for (conn = netconn_list;conn;conn = conn->next) NetConn_ReSendMessage(conn); @@ -1080,21 +1097,16 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, if (clientnum < svs.maxclients) { // prepare the client struct - if ((client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool))) + if ((conn = NetConn_Open(mysocket, peeraddress))) { - if ((conn = NetConn_Open(mysocket, peeraddress))) - { - // allocated connection - LHNETADDRESS_ToString(peeraddress, conn->address, sizeof(conn->address), true); - if (developer.integer) - Con_Printf("Datagram_ParseConnectionless: sending \"accept\" to %s.\n", conn->address); - NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress); - // now set up the client - SV_ConnectClient(clientnum, conn); - NetConn_Heartbeat(1); - } - else - EntityFrame4_FreeDatabase(client->entitydatabase4); + // allocated connection + LHNETADDRESS_ToString(peeraddress, conn->address, sizeof(conn->address), true); + if (developer.integer) + Con_Printf("Datagram_ParseConnectionless: sending \"accept\" to %s.\n", conn->address); + NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress); + // now set up the client + SV_ConnectClient(clientnum, conn); + NetConn_Heartbeat(1); } } else @@ -1221,7 +1233,7 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, { // connect to the client // everything is allocated, just fill in the details - strcpy(conn->address, addressstring2); + strlcpy (conn->address, addressstring2, sizeof (conn->address)); if (developer.integer) Con_Printf("Datagram_ParseConnectionless: sending CCREP_ACCEPT to %s.\n", addressstring2); // send back the info about the server connection @@ -1372,7 +1384,8 @@ void NetConn_ServerFrame(void) NetConn_ServerParsePacket(sv_sockets[i], readbuffer, length, &peeraddress); for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) { - if (host_client->netconnection && realtime > host_client->netconnection->timeout) + // never timeout loopback connections + if (host_client->netconnection && realtime > host_client->netconnection->timeout && LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(host_client->netconnection->mysocket)) != LHNETADDRESSTYPE_LOOP) { Con_Printf("Client \"%s\" connection timed out\n", host_client->name); sv_player = host_client->edict; @@ -1419,10 +1432,20 @@ void NetConn_QueryMasters(void) // search internet for (masternum = 0;sv_masters[masternum].name;masternum++) + { if (sv_masters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, MASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i]))) + { + masterquerycount++; NetConn_WriteString(cl_sockets[i], request, &masteraddress); + } + } } } + if (!masterquerycount) + { + Con_Print("Unable to query master servers, no suitable network sockets active.\n"); + M_Update_Return_Reason("No network"); + } } void NetConn_Heartbeat(int priority) @@ -1495,7 +1518,10 @@ int NetConn_SendToAll(sizebuf_t *data, double blocktime) static void Net_Heartbeat_f(void) { - NetConn_Heartbeat(2); + if (sv.active) + NetConn_Heartbeat(2); + else + Con_Print("No server running, can not heartbeat to master server.\n"); } void PrintStats(netconn_t *conn) @@ -1515,62 +1541,62 @@ void Net_Stats_f(void) Con_Printf("packetsReceived = %i\n", packetsReceived); Con_Printf("receivedDuplicateCount = %i\n", receivedDuplicateCount); Con_Printf("droppedDatagrams = %i\n", droppedDatagrams); - Con_Printf("connections =\n"); + Con_Print("connections =\n"); for (conn = netconn_list;conn;conn = conn->next) PrintStats(conn); } void Net_Slist_f(void) { + masterquerytime = realtime; + masterquerycount = 0; + masterreplycount = 0; + serverquerycount = 0; + serverreplycount = 0; hostCacheCount = 0; memset(&pingcache, 0, sizeof(pingcache)); if (m_state != m_slist) - Con_Printf("Sending requests to master servers\n"); + Con_Print("Sending requests to master servers\n"); NetConn_QueryMasters(); if (m_state != m_slist) - Con_Printf("Listening for replies...\n"); + Con_Print("Listening for replies...\n"); } void NetConn_Init(void) { int i; lhnetaddress_t tempaddress; - netconn_mempool = Mem_AllocPool("Networking"); + netconn_mempool = Mem_AllocPool("Networking", 0, NULL); Cmd_AddCommand("net_stats", Net_Stats_f); Cmd_AddCommand("net_slist", Net_Slist_f); Cmd_AddCommand("heartbeat", Net_Heartbeat_f); Cvar_RegisterVariable(&net_messagetimeout); Cvar_RegisterVariable(&net_messagerejointimeout); Cvar_RegisterVariable(&net_connecttimeout); - Cvar_RegisterVariable(&cl_fakelocalping_min); - Cvar_RegisterVariable(&cl_fakelocalping_max); - Cvar_RegisterVariable(&cl_fakepacketloss_receive); - Cvar_RegisterVariable(&cl_fakepacketloss_send); - Cvar_RegisterVariable(&sv_fakepacketloss_receive); - Cvar_RegisterVariable(&sv_fakepacketloss_send); + Cvar_RegisterVariable(&cl_netlocalping); + Cvar_RegisterVariable(&cl_netpacketloss); Cvar_RegisterVariable(&hostname); Cvar_RegisterVariable(&developer_networking); Cvar_RegisterVariable(&cl_netport); - Cvar_RegisterVariable(&cl_netaddress); - Cvar_RegisterVariable(&cl_netaddress_ipv6); Cvar_RegisterVariable(&sv_netport); - Cvar_RegisterVariable(&sv_netaddress); - Cvar_RegisterVariable(&sv_netaddress_ipv6); + Cvar_RegisterVariable(&net_address); + //Cvar_RegisterVariable(&net_address_ipv6); Cvar_RegisterVariable(&sv_public); Cvar_RegisterVariable(&sv_heartbeatperiod); for (i = 0;sv_masters[i].name;i++) Cvar_RegisterVariable(&sv_masters[i]); +// 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) { if (LHNETADDRESS_FromString(&tempaddress, com_argv[i + 1], 0) == 1) { - Con_Printf("-ip option used, setting cl_netaddress and sv_netaddress to address \"%s\"\n"); - Cvar_SetQuick(&cl_netaddress, com_argv[i + 1]); - Cvar_SetQuick(&sv_netaddress, com_argv[i + 1]); + Con_Printf("-ip option used, setting net_address to \"%s\"\n"); + Cvar_SetQuick(&net_address, com_argv[i + 1]); } else Con_Printf("-ip option used, but unable to parse the address \"%s\"\n", com_argv[i + 1]); } +// COMMANDLINEOPTION: Server: -port sets the port to use for a server (default 26000, the same port as QUAKE itself), useful if you host multiple servers on your machine if (((i = COM_CheckParm("-port")) || (i = COM_CheckParm("-ipport")) || (i = COM_CheckParm("-udpport"))) && i + 1 < com_argc) { i = atoi(com_argv[i + 1]);