X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.c;h=eb99dbd6e9517dbd5fcf2cbb409b9e9335956aaa;hp=2e1e9adb47dab61c2d827d9afb8f9ca8776e43a9;hb=01f19c6c3ff8d4645b8589b3c8274d08a5775af6;hpb=927bd7b13c9a18fb07a8681c7483f632c7ea32f3 diff --git a/netconn.c b/netconn.c index 2e1e9adb..eb99dbd6 100755 --- a/netconn.c +++ b/netconn.c @@ -48,7 +48,7 @@ static cvar_t sv_masters [] = {0, "sv_masterextra2", "64.22.107.125", "dpmaster.deathmask.net - default master server 2 (admin: Willis)"}, // admin: Willis {0, "sv_masterextra3", "92.62.40.73", "dpmaster.tchr.no - default master server 3 (admin: tChr)"}, // admin: tChr #ifdef SUPPORTIPV6 - {0, "sv_masterextra4", "[2001:41d0:2:1628::4450]:27950", "dpmaster.div0.qc.to - default master server 4 (admin: divVerent)"}, // admin: divVerent + {0, "sv_masterextra4", "[2a03:4000:2:225::51:334d]:27950", "dpmaster.sudo.rm-f.org - default master server 4 (admin: divVerent)"}, // admin: divVerent #endif {0, NULL, NULL, NULL} }; @@ -76,9 +76,14 @@ static unsigned char sv_message_buf[NET_MAXMESSAGE]; char cl_readstring[MAX_INPUTLINE]; char sv_readstring[MAX_INPUTLINE]; +cvar_t net_test = {0, "net_test", "0", "internal development use only, leave it alone (usually does nothing anyway)"}; +cvar_t net_usesizelimit = {0, "net_usesizelimit", "2", "use packet size limiting (0: never, 1: in non-CSQC mode, 2: always)"}; +cvar_t net_burstreserve = {0, "net_burstreserve", "0.3", "how much of the burst time to reserve for packet size spikes"}; cvar_t net_messagetimeout = {0, "net_messagetimeout","300", "drops players who have not sent any packets for this many seconds"}; cvar_t net_connecttimeout = {0, "net_connecttimeout","15", "after requesting a connection, the client must reply within this many seconds or be dropped (cuts down on connect floods). Must be above 10 seconds."}; -cvar_t net_connectfloodblockingtimeout = {0, "net_connectfloodblockingtimeout", "5", "when a connection packet is received, it will block all future connect packets from that IP address for this many seconds (cuts down on connect floods)"}; +cvar_t net_connectfloodblockingtimeout = {0, "net_connectfloodblockingtimeout", "5", "when a connection packet is received, it will block all future connect packets from that IP address for this many seconds (cuts down on connect floods). Note that this does not include retries from the same IP; these are handled earlier and let in."}; +cvar_t net_challengefloodblockingtimeout = {0, "net_challengefloodblockingtimeout", "0.5", "when a challenge packet is received, it will block all future challenge packets from that IP address for this many seconds (cuts down on challenge floods). DarkPlaces clients retry once per second, so this should be <= 1. Failure here may lead to connect attempts failing."}; +cvar_t net_getstatusfloodblockingtimeout = {0, "net_getstatusfloodblockingtimeout", "1", "when a getstatus packet is received, it will block all future getstatus packets from that IP address for this many seconds (cuts down on getstatus floods). DarkPlaces retries every 4 seconds, and qstat retries once per second, so this should be <= 1. Failure here may lead to server not showing up in the server list."}; cvar_t hostname = {CVAR_SAVE, "hostname", "UNNAMED", "server message to show in server browser"}; cvar_t developer_networking = {0, "developer_networking", "0", "prints all received and sent packets (recommended only for debugging)"}; @@ -91,6 +96,7 @@ static cvar_t net_slist_timeout = {0, "net_slist_timeout", "4", "how long to lis static cvar_t net_slist_pause = {0, "net_slist_pause", "0", "when set to 1, the server list won't update until it is set back to 0"}; 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 net_slist_favorites = {CVAR_SAVE | CVAR_NQUSERINFOHACK, "net_slist_favorites", "", "contains a list of IP addresses and ports to always query explicitly"}; +static cvar_t net_tos_dscp = {CVAR_SAVE, "net_tos_dscp", "32", "DiffServ Codepoint for network sockets (may need game restart to apply)"}; static cvar_t gameversion = {0, "gameversion", "0", "version of game data (mod-specific) to be sent to querying clients"}; static cvar_t gameversion_min = {0, "gameversion_min", "-1", "minimum version of game data (mod-specific), when client and server gameversion mismatch in the server browser the server is shown as incompatible; if -1, gameversion is used alone"}; static cvar_t gameversion_max = {0, "gameversion_max", "-1", "maximum version of game data (mod-specific), when client and server gameversion mismatch in the server browser the server is shown as incompatible; if -1, gameversion is used alone"}; @@ -652,6 +658,7 @@ qboolean NetConn_CanSend(netconn_t *conn) conn->outgoing_netgraph[conn->outgoing_packetcounter].unreliablebytes = NETGRAPH_NOPACKET; conn->outgoing_netgraph[conn->outgoing_packetcounter].reliablebytes = NETGRAPH_NOPACKET; conn->outgoing_netgraph[conn->outgoing_packetcounter].ackbytes = NETGRAPH_NOPACKET; + conn->outgoing_netgraph[conn->outgoing_packetcounter].cleartime = conn->cleartime; if (realtime > conn->cleartime) return true; else @@ -661,7 +668,24 @@ qboolean NetConn_CanSend(netconn_t *conn) } } -int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolversion_t protocol, int rate, qboolean quakesignon_suppressreliables) +void NetConn_UpdateCleartime(double *cleartime, int rate, int burstsize, int len) +{ + double bursttime = burstsize / (double)rate; + + // delay later packets to obey rate limit + if (*cleartime < realtime - bursttime) + *cleartime = realtime - bursttime; + *cleartime = *cleartime + len / (double)rate; + + // limit bursts to one packet in size ("dialup mode" emulating old behaviour) + if (net_test.integer) + { + if (*cleartime < realtime) + *cleartime = realtime; + } +} + +int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolversion_t protocol, int rate, int burstsize, qboolean quakesignon_suppressreliables) { int totallen = 0; unsigned char sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; @@ -673,6 +697,8 @@ int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolvers if (conn->outgoing_netgraph[conn->outgoing_packetcounter].unreliablebytes == NETGRAPH_CHOKEDPACKET) conn->outgoing_netgraph[conn->outgoing_packetcounter].unreliablebytes = NETGRAPH_NOPACKET; + conn->outgoing_netgraph[conn->outgoing_packetcounter].cleartime = conn->cleartime; + if (protocol == PROTOCOL_QUAKEWORLD) { int packetLen; @@ -862,12 +888,7 @@ int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data, protocolvers } } - // delay later packets to obey rate limit - if (conn->cleartime < realtime - 0.1) - conn->cleartime = realtime - 0.1; - conn->cleartime = conn->cleartime + (double)totallen / (double)rate; - if (conn->cleartime < realtime) - conn->cleartime = realtime; + NetConn_UpdateCleartime(&conn->cleartime, cl_rate.integer, cl_rate_burstsize.integer, totallen); return 0; } @@ -923,7 +944,9 @@ void NetConn_OpenClientPorts(void) int port; NetConn_CloseClientPorts(); + SV_LockThreadMutex(); // FIXME recursive? Crypto_LoadKeys(); // client sockets + SV_UnlockThreadMutex(); port = bound(0, cl_netport.integer, 65535); if (cl_netport.integer != port) @@ -991,7 +1014,9 @@ void NetConn_OpenServerPorts(int opennetports) int port; NetConn_CloseServerPorts(); + SV_LockThreadMutex(); // FIXME recursive? Crypto_LoadKeys(); // server sockets + SV_UnlockThreadMutex(); NetConn_UpdateSockets(); port = bound(0, sv_netport.integer, 65535); @@ -1052,14 +1077,14 @@ netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress) return conn; } -void NetConn_ClearConnectFlood(lhnetaddress_t *peeraddress); +void NetConn_ClearFlood(lhnetaddress_t *peeraddress, server_floodaddress_t *floodlist, size_t floodlength); void NetConn_Close(netconn_t *conn) { netconn_t *c; // remove connection from list // allow the client to reconnect immediately - NetConn_ClearConnectFlood(&(conn->peeraddress)); + NetConn_ClearFlood(&(conn->peeraddress), sv.connectfloodaddresses, sizeof(sv.connectfloodaddresses) / sizeof(sv.connectfloodaddresses[0])); if (conn == netconn_list) netconn_list = conn->next; @@ -1088,6 +1113,9 @@ void NetConn_UpdateSockets(void) { int i, j; + // TODO add logic to automatically close sockets if needed + LHNET_DefaultDSCP(net_tos_dscp.integer); + if (cls.state != ca_dedicated) { if (clientport2 != cl_netport.integer) @@ -1181,6 +1209,7 @@ static int NetConn_ReceivedMessage(netconn_t *conn, const unsigned char *data, s { conn->incoming_packetcounter = (conn->incoming_packetcounter + 1) % NETGRAPH_PACKETS; conn->incoming_netgraph[conn->incoming_packetcounter].time = realtime; + conn->incoming_netgraph[conn->incoming_packetcounter].cleartime = conn->incoming_cleartime; conn->incoming_netgraph[conn->incoming_packetcounter].unreliablebytes = NETGRAPH_LOSTPACKET; conn->incoming_netgraph[conn->incoming_packetcounter].reliablebytes = NETGRAPH_NOPACKET; conn->incoming_netgraph[conn->incoming_packetcounter].ackbytes = NETGRAPH_NOPACKET; @@ -1188,9 +1217,19 @@ static int NetConn_ReceivedMessage(netconn_t *conn, const unsigned char *data, s } conn->incoming_packetcounter = (conn->incoming_packetcounter + 1) % NETGRAPH_PACKETS; conn->incoming_netgraph[conn->incoming_packetcounter].time = realtime; + conn->incoming_netgraph[conn->incoming_packetcounter].cleartime = conn->incoming_cleartime; conn->incoming_netgraph[conn->incoming_packetcounter].unreliablebytes = originallength + 28; conn->incoming_netgraph[conn->incoming_packetcounter].reliablebytes = NETGRAPH_NOPACKET; conn->incoming_netgraph[conn->incoming_packetcounter].ackbytes = NETGRAPH_NOPACKET; + NetConn_UpdateCleartime(&conn->incoming_cleartime, cl_rate.integer, cl_rate_burstsize.integer, originallength + 28); + + // limit bursts to one packet in size ("dialup mode" emulating old behaviour) + if (net_test.integer) + { + if (conn->cleartime < realtime) + conn->cleartime = realtime; + } + if (reliable_ack == conn->qw.reliable_sequence) { // received, now we will be able to send another reliable message @@ -1260,6 +1299,7 @@ static int NetConn_ReceivedMessage(netconn_t *conn, const unsigned char *data, s { conn->incoming_packetcounter = (conn->incoming_packetcounter + 1) % NETGRAPH_PACKETS; conn->incoming_netgraph[conn->incoming_packetcounter].time = realtime; + conn->incoming_netgraph[conn->incoming_packetcounter].cleartime = conn->incoming_cleartime; conn->incoming_netgraph[conn->incoming_packetcounter].unreliablebytes = NETGRAPH_LOSTPACKET; conn->incoming_netgraph[conn->incoming_packetcounter].reliablebytes = NETGRAPH_NOPACKET; conn->incoming_netgraph[conn->incoming_packetcounter].ackbytes = NETGRAPH_NOPACKET; @@ -1267,9 +1307,12 @@ static int NetConn_ReceivedMessage(netconn_t *conn, const unsigned char *data, s } conn->incoming_packetcounter = (conn->incoming_packetcounter + 1) % NETGRAPH_PACKETS; conn->incoming_netgraph[conn->incoming_packetcounter].time = realtime; + conn->incoming_netgraph[conn->incoming_packetcounter].cleartime = conn->incoming_cleartime; conn->incoming_netgraph[conn->incoming_packetcounter].unreliablebytes = originallength + 28; conn->incoming_netgraph[conn->incoming_packetcounter].reliablebytes = NETGRAPH_NOPACKET; conn->incoming_netgraph[conn->incoming_packetcounter].ackbytes = NETGRAPH_NOPACKET; + NetConn_UpdateCleartime(&conn->incoming_cleartime, cl_rate.integer, cl_rate_burstsize.integer, originallength + 28); + conn->nq.unreliableReceiveSequence = sequence + 1; conn->lastMessageTime = realtime; conn->timeout = realtime + newtimeout; @@ -1298,6 +1341,8 @@ static int NetConn_ReceivedMessage(netconn_t *conn, const unsigned char *data, s else if (flags & NETFLAG_ACK) { conn->incoming_netgraph[conn->incoming_packetcounter].ackbytes += originallength + 28; + NetConn_UpdateCleartime(&conn->incoming_cleartime, cl_rate.integer, cl_rate_burstsize.integer, originallength + 28); + if (sequence == (conn->nq.sendSequence - 1)) { if (sequence == conn->nq.ackSequence) @@ -1356,7 +1401,10 @@ static int NetConn_ReceivedMessage(netconn_t *conn, const unsigned char *data, s { unsigned char temppacket[8]; conn->incoming_netgraph[conn->incoming_packetcounter].reliablebytes += originallength + 28; + NetConn_UpdateCleartime(&conn->incoming_cleartime, cl_rate.integer, cl_rate_burstsize.integer, originallength + 28); + conn->outgoing_netgraph[conn->outgoing_packetcounter].ackbytes += 8 + 28; + StoreBigLong(temppacket, 8 | NETFLAG_ACK); StoreBigLong(temppacket + 4, sequence); sendme = Crypto_EncryptPacket(&conn->crypto, temppacket, 8, &cryptosendbuffer, &sendmelen, sizeof(cryptosendbuffer)); @@ -1412,7 +1460,9 @@ static void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_ { crypto_t *crypto; cls.connect_trying = false; +#ifdef CONFIG_MENU M_Update_Return_Reason(""); +#endif // the connection request succeeded, stop current connection and set up a new connection CL_Disconnect(); // if we're connecting to a remote server, shut down any local server @@ -1439,7 +1489,9 @@ static void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_ } Con_Printf("Connection accepted to %s\n", cls.netcon->address); key_dest = key_game; +#ifdef CONFIG_MENU m_state = m_none; +#endif cls.demonum = -1; // not in the demo loop now cls.state = ca_connected; cls.signon = 0; // need all the signon messages before playing @@ -1458,7 +1510,7 @@ static void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_ msg.data = buf; msg.maxsize = sizeof(buf); MSG_WriteChar(&msg, clc_nop); - NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000, false); + NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol, 10000, 0, false); } } @@ -1584,7 +1636,7 @@ static qboolean NetConn_ClientParsePacket_ServerList_PrepareQuery( int protocol, entry = &serverlist_cache[n]; - memset(entry, 0, sizeof(entry)); + memset(entry, 0, sizeof(*entry)); entry->protocol = protocol; // store the data the engine cares about (address and ping) strlcpy (entry->info.cname, ipstring, sizeof(entry->info.cname)); @@ -1681,7 +1733,7 @@ static void NetConn_ClientParsePacket_ServerList_ParseDPList(lhnetaddress_t *sen static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress) { qboolean fromserver; - int ret, c, control; + int ret, c; const char *s; char *string, addressstring2[128], ipstring[32]; char stringbuf[16384]; @@ -1797,7 +1849,9 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat char protocolnames[1400]; Protocol_Names(protocolnames, sizeof(protocolnames)); Con_DPrintf("\"%s\" received, sending connect request back to %s\n", string, addressstring2); +#ifdef CONFIG_MENU M_Update_Return_Reason("Got challenge response"); +#endif // update the server IP in the userinfo (QW servers expect this, and it is used by the reconnect command) InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "*ip", addressstring2); // TODO: add userinfo stuff here instead of using NQ commands? @@ -1807,7 +1861,9 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat if (length == 6 && !memcmp(string, "accept", 6) && cls.connect_trying) { // darkplaces or quake3 +#ifdef CONFIG_MENU M_Update_Return_Reason("Accepted"); +#endif NetConn_ConnectionEstablished(mysocket, peeraddress, PROTOCOL_DARKPLACES3); return true; } @@ -1819,7 +1875,9 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat length = min(length - 7, (int)sizeof(rejectreason) - 1); memcpy(rejectreason, string, length); rejectreason[length] = 0; +#ifdef CONFIG_MENU M_Update_Return_Reason(rejectreason); +#endif return true; } if (length >= 15 && !memcmp(string, "statusResponse\x0A", 15)) @@ -1981,7 +2039,9 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat { // challenge message Con_Printf("challenge %s received, sending QuakeWorld connect request back to %s\n", string + 1, addressstring2); +#ifdef CONFIG_MENU M_Update_Return_Reason("Got QuakeWorld challenge response"); +#endif cls.qw_qport = qport.integer; // update the server IP in the userinfo (QW servers expect this, and it is used by the reconnect command) InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "*ip", addressstring2); @@ -1991,7 +2051,9 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat if (length >= 1 && string[0] == 'j' && cls.connect_trying) { // accept message +#ifdef CONFIG_MENU M_Update_Return_Reason("QuakeWorld Accepted"); +#endif NetConn_ConnectionEstablished(mysocket, peeraddress, PROTOCOL_QUAKEWORLD); return true; } @@ -2060,7 +2122,7 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat return ret; } // netquake control packets, supported for compatibility only - if (length >= 5 && (control = BuffBigLong(data)) && (control & (~NETFLAG_LENGTH_MASK)) == (int)NETFLAG_CTL && (control & NETFLAG_LENGTH_MASK) == length && !ENCRYPTION_REQUIRED) + if (length >= 5 && BuffBigLong(data) == ((int)NETFLAG_CTL | length) && !ENCRYPTION_REQUIRED) { int n; serverlist_info_t *info; @@ -2098,7 +2160,9 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat Con_Printf("Connected to ProQuake %.1f server, enabling precise aim\n", cls.proquake_serverversion / 10.0f); // update the server IP in the userinfo (QW servers expect this, and it is used by the reconnect command) InfoString_SetValue(cls.userinfo, sizeof(cls.userinfo), "*ip", addressstring2); +#ifdef CONFIG_MENU M_Update_Return_Reason("Accepted"); +#endif NetConn_ConnectionEstablished(mysocket, &clientportaddress, PROTOCOL_QUAKE); } break; @@ -2106,7 +2170,9 @@ static int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *dat if (developer_extra.integer) Con_DPrintf("Datagram_ParseConnectionless: received CCREP_REJECT from %s.\n", addressstring2); cls.connect_trying = false; +#ifdef CONFIG_MENU M_Update_Return_Reason((char *)MSG_ReadString(&cl_message, cl_readstring, sizeof(cl_readstring))); +#endif break; case CCREP_SERVER_INFO: if (developer_extra.integer) @@ -2258,14 +2324,18 @@ void NetConn_ClientFrame(void) NetConn_UpdateSockets(); if (cls.connect_trying && cls.connect_nextsendtime < realtime) { +#ifdef CONFIG_MENU if (cls.connect_remainingtries == 0) M_Update_Return_Reason("Connect: Waiting 10 seconds for reply"); +#endif cls.connect_nextsendtime = realtime + 1; cls.connect_remainingtries--; if (cls.connect_remainingtries <= -10) { cls.connect_trying = false; +#ifdef CONFIG_MENU M_Update_Return_Reason("Connect: Failed"); +#endif return; } // try challenge first (newer DP server or QW) @@ -2439,7 +2509,7 @@ static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg *p = 0; } - if ((gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC) && (teamplay.integer > 0)) + if (IS_NEXUIZ_DERIVED(gamemode) && (teamplay.integer > 0)) { if(cl->frags == -666) // spectator strlcpy(teambuf, " 0", sizeof(teambuf)); @@ -2492,31 +2562,34 @@ bad: return false; } -static qboolean NetConn_PreventConnectFlood(lhnetaddress_t *peeraddress) +static qboolean NetConn_PreventFlood(lhnetaddress_t *peeraddress, server_floodaddress_t *floodlist, size_t floodlength, double floodtime, qboolean renew) { - int floodslotnum, bestfloodslotnum; + size_t floodslotnum, bestfloodslotnum; double bestfloodtime; lhnetaddress_t noportpeeraddress; // see if this is a connect flood noportpeeraddress = *peeraddress; LHNETADDRESS_SetPort(&noportpeeraddress, 0); bestfloodslotnum = 0; - bestfloodtime = sv.connectfloodaddresses[bestfloodslotnum].lasttime; - for (floodslotnum = 0;floodslotnum < MAX_CONNECTFLOODADDRESSES;floodslotnum++) + bestfloodtime = floodlist[bestfloodslotnum].lasttime; + for (floodslotnum = 0;floodslotnum < floodlength;floodslotnum++) { - if (bestfloodtime >= sv.connectfloodaddresses[floodslotnum].lasttime) + if (bestfloodtime >= floodlist[floodslotnum].lasttime) { - bestfloodtime = sv.connectfloodaddresses[floodslotnum].lasttime; + bestfloodtime = floodlist[floodslotnum].lasttime; bestfloodslotnum = floodslotnum; } - if (sv.connectfloodaddresses[floodslotnum].lasttime && LHNETADDRESS_Compare(&noportpeeraddress, &sv.connectfloodaddresses[floodslotnum].address) == 0) + if (floodlist[floodslotnum].lasttime && LHNETADDRESS_Compare(&noportpeeraddress, &floodlist[floodslotnum].address) == 0) { // this address matches an ongoing flood address - if (realtime < sv.connectfloodaddresses[floodslotnum].lasttime + net_connectfloodblockingtimeout.value) + if (realtime < floodlist[floodslotnum].lasttime + floodtime) { - // renew the ban on this address so it does not expire - // until the flood has subsided - sv.connectfloodaddresses[floodslotnum].lasttime = realtime; + if(renew) + { + // renew the ban on this address so it does not expire + // until the flood has subsided + floodlist[floodslotnum].lasttime = realtime; + } //Con_Printf("Flood detected!\n"); return true; } @@ -2526,27 +2599,27 @@ static qboolean NetConn_PreventConnectFlood(lhnetaddress_t *peeraddress) } } // begin a new timeout on this address - sv.connectfloodaddresses[bestfloodslotnum].address = noportpeeraddress; - sv.connectfloodaddresses[bestfloodslotnum].lasttime = realtime; + floodlist[bestfloodslotnum].address = noportpeeraddress; + floodlist[bestfloodslotnum].lasttime = realtime; //Con_Printf("Flood detection initiated!\n"); return false; } -void NetConn_ClearConnectFlood(lhnetaddress_t *peeraddress) +void NetConn_ClearFlood(lhnetaddress_t *peeraddress, server_floodaddress_t *floodlist, size_t floodlength) { - int floodslotnum; + size_t floodslotnum; lhnetaddress_t noportpeeraddress; // see if this is a connect flood noportpeeraddress = *peeraddress; LHNETADDRESS_SetPort(&noportpeeraddress, 0); - for (floodslotnum = 0;floodslotnum < MAX_CONNECTFLOODADDRESSES;floodslotnum++) + for (floodslotnum = 0;floodslotnum < floodlength;floodslotnum++) { - if (sv.connectfloodaddresses[floodslotnum].lasttime && LHNETADDRESS_Compare(&noportpeeraddress, &sv.connectfloodaddresses[floodslotnum].address) == 0) + if (floodlist[floodslotnum].lasttime && LHNETADDRESS_Compare(&noportpeeraddress, &floodlist[floodslotnum].address) == 0) { // this address matches an ongoing flood address // remove the ban - sv.connectfloodaddresses[floodslotnum].address.addresstype = LHNETADDRESSTYPE_NONE; - sv.connectfloodaddresses[floodslotnum].lasttime = 0; + floodlist[floodslotnum].address.addresstype = LHNETADDRESSTYPE_NONE; + floodlist[floodslotnum].lasttime = 0; //Con_Printf("Flood cleared!\n"); } } @@ -2831,6 +2904,12 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat challenge[i].address = *peeraddress; NetConn_BuildChallengeString(challenge[i].string, sizeof(challenge[i].string)); } + else + { + // flood control: drop if requesting challenge too often + if(challenge[i].time > realtime - net_challengefloodblockingtimeout.value) + return true; + } challenge[i].time = realtime; // send the challenge dpsnprintf(response, sizeof(response), "\377\377\377\377challenge %s", challenge[i].string); @@ -2935,7 +3014,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat return true; } } - if (client->spawned) + if (client->begun) { // client crashed and is coming back, // keep their stuff intact @@ -2960,7 +3039,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat } } - if (NetConn_PreventConnectFlood(peeraddress)) + if (NetConn_PreventFlood(peeraddress, sv.connectfloodaddresses, sizeof(sv.connectfloodaddresses) / sizeof(sv.connectfloodaddresses[0]), net_connectfloodblockingtimeout.value, true)) return true; // find an empty client slot for this new client @@ -2993,6 +3072,9 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat { const char *challenge = NULL; + if (NetConn_PreventFlood(peeraddress, sv.getstatusfloodaddresses, sizeof(sv.getstatusfloodaddresses) / sizeof(sv.getstatusfloodaddresses[0]), net_getstatusfloodblockingtimeout.value, false)) + return true; + // If there was a challenge in the getinfo message if (length > 8 && string[7] == ' ') challenge = string + 8; @@ -3009,6 +3091,9 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat { const char *challenge = NULL; + if (NetConn_PreventFlood(peeraddress, sv.getstatusfloodaddresses, sizeof(sv.getstatusfloodaddresses) / sizeof(sv.getstatusfloodaddresses[0]), net_getstatusfloodblockingtimeout.value, false)) + return true; + // If there was a challenge in the getinfo message if (length > 10 && string[9] == ' ') challenge = string + 10; @@ -3162,6 +3247,22 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat // or coming back from a timeout // (if so, keep their stuff intact) + crypto_t *crypto = Crypto_ServerGetInstance(peeraddress); + if((crypto && crypto->authenticated) || client->netconnection->crypto.authenticated) + { + if (developer_extra.integer) + Con_Printf("Datagram_ParseConnectionless: sending CCREP_REJECT \"Attempt to downgrade crypto.\" to %s.\n", addressstring2); + SZ_Clear(&sv_message); + // save space for the header, filled in later + MSG_WriteLong(&sv_message, 0); + MSG_WriteByte(&sv_message, CCREP_REJECT); + MSG_WriteString(&sv_message, "Attempt to downgrade crypto.\n"); + StoreBigLong(sv_message.data, NETFLAG_CTL | (sv_message.cursize & NETFLAG_LENGTH_MASK)); + NetConn_Write(mysocket, sv_message.data, sv_message.cursize, peeraddress); + SZ_Clear(&sv_message); + return true; + } + // send a reply if (developer_extra.integer) Con_DPrintf("Datagram_ParseConnectionless: sending duplicate CCREP_ACCEPT to %s.\n", addressstring2); @@ -3176,14 +3277,14 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat // if client is already spawned, re-send the // serverinfo message as they'll need it to play - if (client->spawned) + if (client->begun) SV_SendServerinfo(client); return true; } } // this is a new client, check for connection flood - if (NetConn_PreventConnectFlood(peeraddress)) + if (NetConn_PreventFlood(peeraddress, sv.connectfloodaddresses, sizeof(sv.connectfloodaddresses) / sizeof(sv.connectfloodaddresses[0]), net_connectfloodblockingtimeout.value, true)) break; // find a slot for the new client @@ -3230,6 +3331,10 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat Con_DPrintf("Datagram_ParseConnectionless: received CCREQ_SERVER_INFO from %s.\n", addressstring2); if(!(islocal || sv_public.integer > -1)) break; + + if (NetConn_PreventFlood(peeraddress, sv.getstatusfloodaddresses, sizeof(sv.getstatusfloodaddresses) / sizeof(sv.getstatusfloodaddresses[0]), net_getstatusfloodblockingtimeout.value, false)) + break; + if (sv.active && !strcmp(MSG_ReadString(&sv_message, sv_readstring, sizeof(sv_readstring)), "QUAKE")) { int numclients; @@ -3261,6 +3366,10 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat Con_DPrintf("Datagram_ParseConnectionless: received CCREQ_PLAYER_INFO from %s.\n", addressstring2); if(!(islocal || sv_public.integer > -1)) break; + + if (NetConn_PreventFlood(peeraddress, sv.getstatusfloodaddresses, sizeof(sv.getstatusfloodaddresses) / sizeof(sv.getstatusfloodaddresses[0]), net_getstatusfloodblockingtimeout.value, false)) + break; + if (sv.active) { int playerNumber, activeNumber, clientNumber; @@ -3297,6 +3406,9 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat Con_DPrintf("Datagram_ParseConnectionless: received CCREQ_RULE_INFO from %s.\n", addressstring2); if(!(islocal || sv_public.integer > -1)) break; + + // no flood check here, as it only returns one cvar for one cvar and clients may iterate quickly + if (sv.active) { char *prevCvarName; @@ -3350,7 +3462,7 @@ static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *dat } if (host_client) { - if ((ret = NetConn_ReceivedMessage(host_client->netconnection, data, length, sv.protocol, host_client->spawned ? net_messagetimeout.value : net_connecttimeout.value)) == 2) + if ((ret = NetConn_ReceivedMessage(host_client->netconnection, data, length, sv.protocol, host_client->begun ? net_messagetimeout.value : net_connecttimeout.value)) == 2) { SV_ReadClientMessage(); return ret; @@ -3485,12 +3597,16 @@ void NetConn_QueryMasters(qboolean querydp, qboolean queryqw) { if (sv_qwmasters[masternum].string && LHNETADDRESS_FromString(&masteraddress, sv_qwmasters[masternum].string, QWMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i]))) { +#ifdef CONFIG_MENU if (m_state != m_slist) { +#endif char lookupstring[128]; LHNETADDRESS_ToString(&masteraddress, lookupstring, sizeof(lookupstring), true); Con_Printf("Querying master %s (resolved from %s)\n", lookupstring, sv_qwmasters[masternum].string); +#ifdef CONFIG_MENU } +#endif masterquerycount++; NetConn_Write(cl_sockets[i], request, (int)strlen(request) + 1, &masteraddress); } @@ -3514,7 +3630,9 @@ void NetConn_QueryMasters(qboolean querydp, qboolean queryqw) if (!masterquerycount) { Con_Print("Unable to query master servers, no suitable network sockets active.\n"); +#ifdef CONFIG_MENU M_Update_Return_Reason("No network"); +#endif } } @@ -3584,12 +3702,16 @@ void Net_Stats_f(void) void Net_Refresh_f(void) { +#ifdef CONFIG_MENU if (m_state != m_slist) { +#endif Con_Print("Sending new requests to master servers\n"); ServerList_QueryList(false, true, false, true); Con_Print("Listening for replies...\n"); +#ifdef CONFIG_MENU } else ServerList_QueryList(false, true, false, false); +#endif } void Net_Slist_f(void) @@ -3597,12 +3719,16 @@ void Net_Slist_f(void) ServerList_ResetMasks(); serverlist_sortbyfield = SLIF_PING; serverlist_sortflags = 0; +#ifdef CONFIG_MENU if (m_state != m_slist) { +#endif Con_Print("Sending requests to master servers\n"); ServerList_QueryList(true, true, false, true); Con_Print("Listening for replies...\n"); +#ifdef CONFIG_MENU } else ServerList_QueryList(true, true, false, false); +#endif } void Net_SlistQW_f(void) @@ -3610,13 +3736,17 @@ void Net_SlistQW_f(void) ServerList_ResetMasks(); serverlist_sortbyfield = SLIF_PING; serverlist_sortflags = 0; +#ifdef CONFIG_MENU if (m_state != m_slist) { +#endif Con_Print("Sending requests to master servers\n"); ServerList_QueryList(true, false, true, true); serverlist_consoleoutput = true; Con_Print("Listening for replies...\n"); +#ifdef CONFIG_MENU } else ServerList_QueryList(true, false, true, false); +#endif } void NetConn_Init(void) @@ -3629,6 +3759,9 @@ void NetConn_Init(void) Cmd_AddCommand("net_slistqw", Net_SlistQW_f, "query qw master servers and print all server information"); Cmd_AddCommand("net_refresh", Net_Refresh_f, "query dp master servers and refresh all server information"); Cmd_AddCommand("heartbeat", Net_Heartbeat_f, "send a heartbeat to the master server (updates your server information)"); + Cvar_RegisterVariable(&net_test); + Cvar_RegisterVariable(&net_usesizelimit); + Cvar_RegisterVariable(&net_burstreserve); Cvar_RegisterVariable(&rcon_restricted_password); Cvar_RegisterVariable(&rcon_restricted_commands); Cvar_RegisterVariable(&rcon_secure_maxdiff); @@ -3638,9 +3771,13 @@ void NetConn_Init(void) Cvar_RegisterVariable(&net_slist_maxtries); Cvar_RegisterVariable(&net_slist_favorites); Cvar_RegisterVariable(&net_slist_pause); + if(LHNET_DefaultDSCP(-1) >= 0) // register cvar only if supported + Cvar_RegisterVariable(&net_tos_dscp); Cvar_RegisterVariable(&net_messagetimeout); Cvar_RegisterVariable(&net_connecttimeout); Cvar_RegisterVariable(&net_connectfloodblockingtimeout); + Cvar_RegisterVariable(&net_challengefloodblockingtimeout); + Cvar_RegisterVariable(&net_getstatusfloodblockingtimeout); Cvar_RegisterVariable(&cl_netlocalping); Cvar_RegisterVariable(&cl_netpacketloss_send); Cvar_RegisterVariable(&cl_netpacketloss_receive);