X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.c;h=3226f763b34c529ae022a43aa35a641d44ea6773;hp=363fbb9e1d0314b6798aeeb6ae8ed12d37ec61b4;hb=49efc53510842f29eccbc160e1aa56c17e575468;hpb=e76f5bbe8ce08bc00fb4a4ad26a9418dac663639 diff --git a/netconn.c b/netconn.c index 363fbb9e..3226f763 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", "69.59.212.88"}, + {0, "sv_masterextra2", "66.28.32.64"}, {0, NULL, NULL} }; @@ -49,6 +49,14 @@ 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"}; + + /* statistic counters */ static int packetsSent = 0; static int packetsReSent = 0; @@ -61,11 +69,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]; @@ -76,16 +90,22 @@ 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) + 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) + return 0; if (developer_networking.integer && length != 0) { char addressstring[128], addressstring2[128]; @@ -104,7 +124,17 @@ int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddres int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const lhnetaddress_t *peeraddress) { - int ret = LHNET_Write(mysocket, data, length, peeraddress); + int ret; + int i; + if (cl_fakepacketloss_send.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) + return length; + ret = LHNET_Write(mysocket, data, length, peeraddress); if (developer_networking.integer) { char addressstring[128], addressstring2[128]; @@ -133,8 +163,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"); @@ -143,14 +173,14 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data) memcpy(conn->sendMessage, data->data, data->cursize); conn->sendMessageLength = data->cursize; - if (conn->sendMessageLength <= MAX_DATAGRAM) + if (conn->sendMessageLength <= MAX_PACKETFRAGMENT) { dataLen = conn->sendMessageLength; eom = NETFLAG_EOM; } else { - dataLen = MAX_DATAGRAM; + dataLen = MAX_PACKETFRAGMENT; eom = 0; } @@ -159,7 +189,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; @@ -182,14 +212,14 @@ static void NetConn_SendMessageNext(netconn_t *conn) if (conn->sendMessageLength && !conn->canSend && conn->sendNext) { - if (conn->sendMessageLength <= MAX_DATAGRAM) + if (conn->sendMessageLength <= MAX_PACKETFRAGMENT) { dataLen = conn->sendMessageLength; eom = NETFLAG_EOM; } else { - dataLen = MAX_DATAGRAM; + dataLen = MAX_PACKETFRAGMENT; eom = 0; } @@ -198,7 +228,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; @@ -220,14 +250,14 @@ static void NetConn_ReSendMessage(netconn_t *conn) if (conn->sendMessageLength && !conn->canSend && (realtime - conn->lastSendTime) > 1.0) { - if (conn->sendMessageLength <= MAX_DATAGRAM) + if (conn->sendMessageLength <= MAX_PACKETFRAGMENT) { dataLen = conn->sendMessageLength; eom = NETFLAG_EOM; } else { - dataLen = MAX_DATAGRAM; + dataLen = MAX_PACKETFRAGMENT; eom = 0; } @@ -236,7 +266,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; @@ -258,20 +288,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++; @@ -290,20 +320,40 @@ void NetConn_CloseClientPorts(void) LHNET_CloseSocket(cl_sockets[cl_numsockets - 1]); } +void NetConn_OpenClientPort(const char *addressstring, int defaultport) +{ + lhnetaddress_t address; + lhnetsocket_t *s; + char addressstring2[1024]; + if (LHNETADDRESS_FromString(&address, addressstring, defaultport)) + { + if ((s = LHNET_OpenSocket_Connectionless(&address))) + { + cl_sockets[cl_numsockets++] = s; + LHNETADDRESS_ToString(LHNET_AddressFromSocket(s), addressstring2, sizeof(addressstring2), true); + Con_Printf("Client opened a socket on address %s\n", addressstring2); + } + else + { + LHNETADDRESS_ToString(&address, addressstring2, sizeof(addressstring2), true); + Con_Printf("Client failed to open a socket on address %s\n", addressstring2); + } + } + else + Con_Printf("Client unable to parse address %s\n", addressstring); +} + void NetConn_OpenClientPorts(void) { int port; - lhnetaddress_t address; NetConn_CloseClientPorts(); port = bound(0, cl_netport.integer, 65535); if (cl_netport.integer != port) Cvar_SetValueQuick(&cl_netport, port); - LHNETADDRESS_FromString(&address, "local", port); - cl_sockets[cl_numsockets++] = LHNET_OpenSocket_Connectionless(&address); - LHNETADDRESS_FromString(&address, cl_netaddress.string, port); - cl_sockets[cl_numsockets++] = LHNET_OpenSocket_Connectionless(&address); - LHNETADDRESS_FromString(&address, cl_netaddress_ipv6.string, port); - cl_sockets[cl_numsockets++] = LHNET_OpenSocket_Connectionless(&address); + Con_Printf("Client using port %i\n", port); + NetConn_OpenClientPort("local:2", 0); + NetConn_OpenClientPort(net_address.string, port); + //NetConn_OpenClientPort(net_address_ipv6.string, port); } void NetConn_CloseServerPorts(void) @@ -313,25 +363,48 @@ void NetConn_CloseServerPorts(void) LHNET_CloseSocket(sv_sockets[sv_numsockets - 1]); } +void NetConn_OpenServerPort(const char *addressstring, int defaultport) +{ + lhnetaddress_t address; + lhnetsocket_t *s; + char addressstring2[1024]; + if (LHNETADDRESS_FromString(&address, addressstring, defaultport)) + { + if ((s = LHNET_OpenSocket_Connectionless(&address))) + { + sv_sockets[sv_numsockets++] = s; + LHNETADDRESS_ToString(LHNET_AddressFromSocket(s), addressstring2, sizeof(addressstring2), true); + Con_Printf("Server listening on address %s\n", addressstring2); + } + else + { + LHNETADDRESS_ToString(&address, addressstring2, sizeof(addressstring2), true); + Con_Printf("Server failed to open socket on address %s\n", addressstring2); + } + } + else + Con_Printf("Server unable to parse address %s\n", addressstring); +} + void NetConn_OpenServerPorts(int opennetports) { int port; - lhnetaddress_t address; NetConn_CloseServerPorts(); port = bound(0, sv_netport.integer, 65535); if (port == 0) port = 26000; + Con_Printf("Server using port %i\n", port); if (sv_netport.integer != port) Cvar_SetValueQuick(&sv_netport, port); - LHNETADDRESS_FromString(&address, "local", port); - sv_sockets[sv_numsockets++] = LHNET_OpenSocket_Connectionless(&address); + if (cls.state != ca_dedicated) + NetConn_OpenServerPort("local:1", 0); if (opennetports) { - LHNETADDRESS_FromString(&address, sv_netaddress.string, port); - sv_sockets[sv_numsockets++] = LHNET_OpenSocket_Connectionless(&address); - LHNETADDRESS_FromString(&address, sv_netaddress_ipv6.string, port); - sv_sockets[sv_numsockets++] = LHNET_OpenSocket_Connectionless(&address); + 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"); } lhnetsocket_t *NetConn_ChooseClientSocketForAddress(lhnetaddress_t *address) @@ -358,6 +431,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; @@ -399,17 +477,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) { - clientport = 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 = clientport2; NetConn_CloseClientPorts(); } if (cl_numsockets == 0) @@ -420,7 +498,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"); } } @@ -465,7 +543,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) @@ -476,13 +554,13 @@ 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_DATAGRAM; + conn->sendMessageLength -= MAX_PACKETFRAGMENT; if (conn->sendMessageLength > 0) { - memcpy(conn->sendMessage, conn->sendMessage+MAX_DATAGRAM, conn->sendMessageLength); + memcpy(conn->sendMessage, conn->sendMessage+MAX_PACKETFRAGMENT, conn->sendMessageLength); conn->sendNext = true; NetConn_SendMessageNext(conn); } @@ -493,10 +571,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) @@ -549,6 +627,13 @@ void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peer Host_Reconnect_f(); } +int NetConn_IsLocalGame(void) +{ + if (cls.state == ca_connected && sv.active && cl.maxclients == 1) + return true; + return false; +} + static struct { double senttime; @@ -613,110 +698,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; @@ -768,7 +872,7 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, 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); + strlcpy (m_return_reason, data, sizeof (m_return_reason)); break; #if 0 case CCREP_SERVER_INFO: @@ -790,20 +894,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; @@ -842,13 +944,26 @@ void NetConn_ClientFrame(void) if (cls.connect_remainingtries == 0) { cls.connect_trying = false; - Host_Error("Connect failed\n"); + if (m_state == m_slist) + strcpy (m_return_reason, "Connect: Failed"); + else + Con_Print("Connect failed\n"); return; } if (cls.connect_nextsendtime) - Con_Printf("Still trying...\n"); + { + if (m_state == m_slist) + strcpy (m_return_reason, "Connect: Still trying"); + else + Con_Print("Still trying...\n"); + } else - Con_Printf("Trying...\n"); + { + if (m_state == m_slist) + strcpy (m_return_reason, "Connect: Trying"); + else + Con_Print("Trying...\n"); + } cls.connect_nextsendtime = realtime + 1; cls.connect_remainingtries--; // try challenge first (newer server) @@ -869,7 +984,7 @@ 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(); } for (conn = netconn_list;conn;conn = conn->next) @@ -974,7 +1089,7 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, { // see if this is a duplicate connection request for (clientnum = 0, client = svs.clients;clientnum < svs.maxclients;clientnum++, client++) - if (client->active && LHNETADDRESS_Compare(peeraddress, &client->netconnection->peeraddress) == 0) + if (client->netconnection && LHNETADDRESS_Compare(peeraddress, &client->netconnection->peeraddress) == 0) break; if (clientnum < svs.maxclients) { @@ -1000,27 +1115,33 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, for (clientnum = 0, client = svs.clients;clientnum < svs.maxclients;clientnum++, client++) if (!client->active) break; - if (clientnum == svs.maxclients) + if (clientnum < svs.maxclients) + { + // prepare the client struct + if ((client->entitydatabase4 = EntityFrame4_AllocDatabase(sv_clients_mempool))) + { + 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); + } + } + else { // server is full if (developer.integer) Con_Printf("Datagram_ParseConnectionless: sending \"reject Server is full.\" to %s.\n", addressstring2); NetConn_WriteString(mysocket, "\377\377\377\377reject Server is full.", peeraddress); } - else - { - 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 struct - SV_ConnectClient(clientnum, conn); - NetConn_Heartbeat(1); - } - } } } } @@ -1100,7 +1221,7 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, { // see if this is a duplicate connection request for (clientnum = 0, client = svs.clients;clientnum < svs.maxclients;clientnum++, client++) - if (client->active && LHNETADDRESS_Compare(peeraddress, &client->netconnection->peeraddress) == 0) + if (client->netconnection && LHNETADDRESS_Compare(peeraddress, &client->netconnection->peeraddress) == 0) break; if (clientnum < svs.maxclients) { @@ -1138,7 +1259,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 @@ -1266,7 +1387,7 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, #endif for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) { - if (host_client->active && host_client->netconnection && host_client->netconnection->mysocket == mysocket && !LHNETADDRESS_Compare(&host_client->netconnection->peeraddress, peeraddress)) + if (host_client->netconnection && host_client->netconnection->mysocket == mysocket && !LHNETADDRESS_Compare(&host_client->netconnection->peeraddress, peeraddress)) { sv_player = host_client->edict; if ((ret = NetConn_ReceivedMessage(host_client->netconnection, data, length)) == 2) @@ -1289,7 +1410,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->active && 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; @@ -1336,10 +1458,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"); + strcpy(m_return_reason, "No network"); + } } void NetConn_Heartbeat(int priority) @@ -1393,7 +1525,7 @@ int NetConn_SendToAll(sizebuf_t *data, double blocktime) NetConn_ServerFrame(); for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) { - if (host_client->active) + if (host_client->netconnection) { if (NetConn_CanSendMessage(host_client->netconnection)) { @@ -1410,33 +1542,12 @@ int NetConn_SendToAll(sizebuf_t *data, double blocktime) return count; } -static void MaxPlayers_f(void) -{ - int n; - - if (Cmd_Argc() != 2) - { - Con_Printf("\"maxplayers\" is \"%u\"\n", svs.maxclients); - return; - } - - if (sv.active) - { - Con_Printf("maxplayers can not be changed while a server is running.\n"); - return; - } - - n = atoi(Cmd_Argv(1)); - n = bound(1, n, MAX_SCOREBOARD); - if (svs.maxclients != n) - Con_Printf("\"maxplayers\" set to \"%u\"\n", n); - - SV_SetMaxClients(n); -} - 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) @@ -1456,45 +1567,75 @@ 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 masternum; + int i; + lhnetaddress_t tempaddress; netconn_mempool = Mem_AllocPool("Networking"); Cmd_AddCommand("net_stats", Net_Stats_f); Cmd_AddCommand("net_slist", Net_Slist_f); - Cmd_AddCommand("maxplayers", MaxPlayers_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(&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 (masternum = 0;sv_masters[masternum].name;masternum++) - Cvar_RegisterVariable(&sv_masters[masternum]); + for (i = 0;sv_masters[i].name;i++) + Cvar_RegisterVariable(&sv_masters[i]); + 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 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]); + } + if (((i = COM_CheckParm("-port")) || (i = COM_CheckParm("-ipport")) || (i = COM_CheckParm("-udpport"))) && i + 1 < com_argc) + { + i = atoi(com_argv[i + 1]); + if (i >= 0 && i < 65536) + { + Con_Printf("-port option used, setting port cvar to %i\n", i); + Cvar_SetValueQuick(&sv_netport, i); + } + else + Con_Printf("-port option used, but %i is not a valid port number\n", i); + } cl_numsockets = 0; sv_numsockets = 0; memset(&pingcache, 0, sizeof(pingcache));