X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=netconn.c;h=baa77b62c6eaac7c6bc9806a5ff948ecf18e0887;hb=d159736a199e4043ed98cde48f6d5716ec40845c;hp=09e7d059f41b4ecaad51d6268706c65addd82cea;hpb=78ac19b44fc4e0e415395d88c1258dc37dacd368;p=xonotic%2Fdarkplaces.git diff --git a/netconn.c b/netconn.c index 09e7d059..baa77b62 100755 --- a/netconn.c +++ b/netconn.c @@ -25,35 +25,41 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MASTER_PORT 27950 -cvar_t sv_public = {0, "sv_public", "1"}; -static cvar_t sv_heartbeatperiod = {CVAR_SAVE, "sv_heartbeatperiod", "180"}; +// note this defaults on for dedicated servers, off for listen servers +cvar_t sv_public = {0, "sv_public", "0", "advertises this server on the master server (so that players can find it in the server browser)"}; +static cvar_t sv_heartbeatperiod = {CVAR_SAVE, "sv_heartbeatperiod", "120", "how often to send heartbeat in seconds (only used if sv_public is 1)"}; // FIXME: resolve DNS on masters whenever their value changes and cache it (to avoid major delays in active servers when they heartbeat) static cvar_t sv_masters [] = { - {CVAR_SAVE, "sv_master1", ""}, - {CVAR_SAVE, "sv_master2", ""}, - {CVAR_SAVE, "sv_master3", ""}, - {CVAR_SAVE, "sv_master4", ""}, - {0, "sv_masterextra1", "69.59.212.88"}, // ghdigital.com - {0, "sv_masterextra2", "66.169.205.13"}, // dpmaster.deathmask.net - {0, "sv_masterextra3", "12.166.196.192"}, // blaze.mindphukd.org - {0, NULL, NULL} + {CVAR_SAVE, "sv_master1", "", "user-chosen master server 1"}, + {CVAR_SAVE, "sv_master2", "", "user-chosen master server 2"}, + {CVAR_SAVE, "sv_master3", "", "user-chosen master server 3"}, + {CVAR_SAVE, "sv_master4", "", "user-chosen master server 4"}, + {0, "sv_masterextra1", "ghdigital.com", "default master server 1 (admin: LordHavoc)"}, // admin: LordHavoc + {0, "sv_masterextra2", "dpmaster.deathmask.net", "default master server 2 (admin: Willis)"}, // admin: Willis + {0, "sv_masterextra3", "12.166.196.192", "default master server 3 (admin: Venim)"}, // admin: Venim + {0, "sv_masterextra4", "excalibur.nvg.ntnu.no", "default master server 4 (admin: tChr)"}, // admin: tChr + {0, NULL, NULL, NULL} }; static double nextheartbeattime = 0; sizebuf_t net_message; +static unsigned char net_message_buf[NET_MAXMESSAGE]; -cvar_t net_messagetimeout = {0, "net_messagetimeout","300"}; -cvar_t net_messagerejointimeout = {0, "net_messagerejointimeout","10"}; -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_netlocalping = {0, "cl_netlocalping","0"}; -static cvar_t cl_netpacketloss = {0, "cl_netpacketloss","0"}; +cvar_t net_messagetimeout = {0, "net_messagetimeout","300", "drops players who have not sent any packets for this many seconds"}; +cvar_t net_messagerejointimeout = {0, "net_messagerejointimeout","10", "give a player this much time in seconds to rejoin and continue playing (not losing frags and such)"}; +cvar_t net_connecttimeout = {0, "net_connecttimeout","10", "after requesting a connection, the client must reply within this many seconds or be dropped (cuts down on connect floods)"}; +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)"}; +cvar_t cl_netlocalping = {0, "cl_netlocalping","0", "lags local loopback connection by this much ping time (useful to play more fairly on your own server with people with higher pings)"}; +static cvar_t cl_netpacketloss = {0, "cl_netpacketloss","0", "drops this percentage of packets (incoming and outgoing), useful for testing network protocol robustness (effects failing to start, sounds failing to play, etc)"}; +static cvar_t net_slist_queriespersecond = {0, "net_slist_queriespersecond", "20", "how many server information requests to send per second"}; +static cvar_t net_slist_queriesperframe = {0, "net_slist_queriesperframe", "4", "maximum number of server information requests to send each rendered frame (guards against low framerates causing problems)"}; +static cvar_t net_slist_timeout = {0, "net_slist_timeout", "4", "how long to listen for a server information response before giving up"}; +static cvar_t net_slist_maxtries = {0, "net_slist_maxtries", "3", "how many times to ask the same server for information (more times gives better ping reports but takes longer)"}; /* statistic counters */ static int packetsSent = 0; @@ -73,8 +79,11 @@ int masterreplycount = 0; int serverquerycount = 0; int serverreplycount = 0; -static qbyte sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; -static qbyte readbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; +// this is only false if there are still servers left to query +int serverlist_querysleep = true; + +static unsigned char sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; +static unsigned char readbuffer[NET_HEADERSIZE+NET_MAXMESSAGE]; int cl_numsockets; lhnetsocket_t *cl_sockets[16]; @@ -84,10 +93,10 @@ lhnetsocket_t *sv_sockets[16]; netconn_t *netconn_list = NULL; mempool_t *netconn_mempool = NULL; -cvar_t cl_netport = {0, "cl_port", "0"}; -cvar_t sv_netport = {0, "port", "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]"}; +cvar_t cl_netport = {0, "cl_port", "0", "forces client to use chosen port number if not 0"}; +cvar_t sv_netport = {0, "port", "26000", "server port for players to connect to"}; +cvar_t net_address = {0, "net_address", "0.0.0.0", "network address to open ports on"}; +//cvar_t net_netaddress_ipv6 = {0, "net_address_ipv6", "[0:0:0:0:0:0:0:0]", "network address to open ipv6 ports on"}; // ServerList interface serverlist_mask_t serverlist_andmasks[SERVERLIST_ANDMASKCOUNT]; @@ -109,14 +118,16 @@ qboolean serverlist_consoleoutput; static void _ServerList_ViewList_Helper_InsertBefore( int index, serverlist_entry_t *entry ) { int i; - if( serverlist_viewcount == SERVERLIST_VIEWLISTSIZE ) - return; + if( serverlist_viewcount < SERVERLIST_VIEWLISTSIZE ) { + i = serverlist_viewcount++; + } else { + i = SERVERLIST_VIEWLISTSIZE - 1; + } - for( i = serverlist_viewcount ; i > index ; i-- ) + for( ; i > index ; i-- ) serverlist_viewlist[ i ] = serverlist_viewlist[ i - 1 ]; serverlist_viewlist[index] = entry; - serverlist_viewcount++; } // we suppose serverlist_viewcount to be valid, ie > 0 @@ -185,6 +196,8 @@ static qboolean _ServerList_CompareInt( int A, serverlist_maskop_t op, int B ) case SLMO_NOTEQUAL: return A != B; case SLMO_GREATEREQUAL: + case SLMO_CONTAINS: + case SLMO_NOTCONTAIN: return A >= B; default: Con_DPrint( "_ServerList_CompareInt: Bad op!\n" ); @@ -193,26 +206,35 @@ static qboolean _ServerList_CompareInt( int A, serverlist_maskop_t op, int B ) } static qboolean _ServerList_CompareStr( const char *A, serverlist_maskop_t op, const char *B ) -{ +{ + int i; + char bufferA[ 256 ], bufferB[ 256 ]; // should be more than enough + for (i = 0;i < (int)sizeof(bufferA)-1 && A[i];i++) + bufferA[i] = (A[i] >= 'A' && A[i] <= 'Z') ? (A[i] + 'a' - 'A') : A[i]; + bufferA[i] = 0; + for (i = 0;i < (int)sizeof(bufferB)-1 && B[i];i++) + bufferB[i] = (B[i] >= 'A' && B[i] <= 'Z') ? (B[i] + 'a' - 'A') : B[i]; + bufferB[i] = 0; + // Same here, also using an intermediate & final return would be more appropriate // A info B mask switch( op ) { case SLMO_CONTAINS: - return *B && !!strstr( A, B ); // we want a real bool + return *bufferB && !!strstr( bufferA, bufferB ); // we want a real bool case SLMO_NOTCONTAIN: - return !*B || !strstr( A, B ); + return !*bufferB || !strstr( bufferA, bufferB ); case SLMO_LESS: - return strcmp( A, B ) < 0; + return strcmp( bufferA, bufferB ) < 0; case SLMO_LESSEQUAL: - return strcmp( A, B ) <= 0; + return strcmp( bufferA, bufferB ) <= 0; case SLMO_EQUAL: - return strcmp( A, B ) == 0; + return strcmp( bufferA, bufferB ) == 0; case SLMO_GREATER: - return strcmp( A, B ) > 0; + return strcmp( bufferA, bufferB ) > 0; case SLMO_NOTEQUAL: - return strcmp( A, B ) != 0; + return strcmp( bufferA, bufferB ) != 0; case SLMO_GREATEREQUAL: - return strcmp( A, B ) >= 0; + return strcmp( bufferA, bufferB ) >= 0; default: Con_DPrint( "_ServerList_CompareStr: Bad op!\n" ); return false; @@ -251,9 +273,7 @@ static void ServerList_ViewList_Insert( serverlist_entry_t *entry ) { int start, end, mid; - if( serverlist_viewcount == SERVERLIST_VIEWLISTSIZE ) - return; - + // FIXME: change this to be more readable (...) // now check whether it passes through the masks for( start = 0 ; serverlist_andmasks[start].active && start < SERVERLIST_ANDMASKCOUNT ; start++ ) if( !_ServerList_Entry_Mask( &serverlist_andmasks[start], &entry->info ) ) @@ -316,7 +336,7 @@ void ServerList_RebuildViewList(void) serverlist_viewcount = 0; for( i = 0 ; i < serverlist_cachecount ; i++ ) - if( serverlist_cache[i].finished ) + if( serverlist_cache[i].query == SQS_QUERIED ) ServerList_ViewList_Insert( &serverlist_cache[i] ); } @@ -331,9 +351,9 @@ static void _ServerList_Test(void) { int i; for( i = 0 ; i < 1024 ; i++ ) { - memset( &serverlist_cache[serverlist_cachecount], 0, sizeof( serverlist_t ) ); - serverlist_cache[serverlist_cachecount].info.ping = rand() % 450 + 250; - dpsnprintf( serverlist_cache[serverlist_cachecount].info.name, 128, "Black's ServerList Test %i", i ); + memset( &serverlist_cache[serverlist_cachecount], 0, sizeof( serverlist_entry_t ) ); + serverlist_cache[serverlist_cachecount].info.ping = 1000 + 1024 - i; + dpsnprintf( serverlist_cache[serverlist_cachecount].info.name, sizeof(serverlist_cache[serverlist_cachecount].info.name), "Black's ServerList Test %i", i ); serverlist_cache[serverlist_cachecount].finished = true; sprintf( serverlist_cache[serverlist_cachecount].line1, "%i %s", serverlist_cache[serverlist_cachecount].info.ping, serverlist_cache[serverlist_cachecount].info.name ); ServerList_ViewList_Insert( &serverlist_cache[serverlist_cachecount] ); @@ -352,9 +372,10 @@ void ServerList_QueryList(void) serverlist_cachecount = 0; serverlist_viewcount = 0; serverlist_consoleoutput = false; - NetConn_QueryMasters(); //_ServerList_Test(); + + NetConn_QueryMasters(); } // rest @@ -377,7 +398,7 @@ int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddres { LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true); Con_Printf("LHNET_Read(%p (%s), %p, %i, %p) = %i from %s:\n", mysocket, addressstring, data, maxlength, peeraddress, length, addressstring2); - Com_HexDumpToConsole(data, length); + Com_HexDumpToConsole((unsigned char *)data, length); } else Con_Printf("LHNET_Read(%p (%s), %p, %i, %p) = %i\n", mysocket, addressstring, data, maxlength, peeraddress, length); @@ -400,7 +421,7 @@ int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const l LHNETADDRESS_ToString(LHNET_AddressFromSocket(mysocket), addressstring, sizeof(addressstring), true); LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true); Con_Printf("LHNET_Write(%p (%s), %p, %i, %p (%s)) = %i%s\n", mysocket, addressstring, data, length, peeraddress, addressstring2, length, ret == length ? "" : " (ERROR)"); - Com_HexDumpToConsole(data, length); + Com_HexDumpToConsole((unsigned char *)data, length); } return ret; } @@ -408,7 +429,7 @@ int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const l int NetConn_WriteString(lhnetsocket_t *mysocket, const char *string, const lhnetaddress_t *peeraddress) { // note this does not include the trailing NULL because we add that in the parser - return NetConn_Write(mysocket, string, strlen(string), peeraddress); + return NetConn_Write(mysocket, string, (int)strlen(string), peeraddress); } int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data) @@ -420,13 +441,22 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data) //#ifdef DEBUG if (data->cursize == 0) - Sys_Error("Datagram_SendMessage: zero length message\n"); + { + Con_Printf ("Datagram_SendMessage: zero length message\n"); + return -1; + } if (data->cursize > (int)sizeof(conn->sendMessage)) - Sys_Error("Datagram_SendMessage: message too big (%u > %u)\n", data->cursize, sizeof(conn->sendMessage)); + { + Con_Printf ("Datagram_SendMessage: message too big (%u > %u)\n", data->cursize, sizeof(conn->sendMessage)); + return -1; + } if (conn->canSend == false) - Sys_Error("SendMessage: called with canSend == false\n"); + { + Con_Printf ("SendMessage: called with canSend == false\n"); + return -1; + } //#endif memcpy(conn->sendMessage, data->data, data->cursize); @@ -445,7 +475,7 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data) packetLen = NET_HEADERSIZE + dataLen; - header = (void *)sendbuffer; + header = (unsigned int *)sendbuffer; header[0] = BigLong(packetLen | (NETFLAG_DATA | eom)); header[1] = BigLong(conn->sendSequence); memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen); @@ -484,7 +514,7 @@ static void NetConn_SendMessageNext(netconn_t *conn) packetLen = NET_HEADERSIZE + dataLen; - header = (void *)sendbuffer; + header = (unsigned int *)sendbuffer; header[0] = BigLong(packetLen | (NETFLAG_DATA | eom)); header[1] = BigLong(conn->sendSequence); memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen); @@ -522,7 +552,7 @@ static void NetConn_ReSendMessage(netconn_t *conn) packetLen = NET_HEADERSIZE + dataLen; - header = (void *)sendbuffer; + header = (unsigned int *)sendbuffer; header[0] = BigLong(packetLen | (NETFLAG_DATA | eom)); header[1] = BigLong(conn->sendSequence - 1); memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen); @@ -545,19 +575,25 @@ qboolean NetConn_CanSendMessage(netconn_t *conn) int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data) { int packetLen; - int *header; + unsigned int *header; packetLen = NET_HEADERSIZE + data->cursize; //#ifdef DEBUG if (data->cursize == 0) - Sys_Error("Datagram_SendUnreliableMessage: zero length message\n"); + { + Con_Printf ("Datagram_SendUnreliableMessage: zero length message\n"); + return -1; + } if (packetLen > (int)sizeof(sendbuffer)) - Sys_Error("Datagram_SendUnreliableMessage: message too big %u\n", data->cursize); + { + Con_Printf ("Datagram_SendUnreliableMessage: message too big %u\n", data->cursize); + return -1; + } //#endif - header = (void *)sendbuffer; + header = (unsigned int *)sendbuffer; header[0] = BigLong(packetLen | NETFLAG_UNRELIABLE); header[1] = BigLong(conn->unreliableSendSequence); memcpy(sendbuffer + NET_HEADERSIZE, data->data, data->cursize); @@ -626,29 +662,41 @@ void NetConn_OpenServerPort(const char *addressstring, int defaultport) { lhnetaddress_t address; lhnetsocket_t *s; + int port; char addressstring2[1024]; - if (LHNETADDRESS_FromString(&address, addressstring, defaultport)) + + for (port = defaultport; port <= defaultport + 100; port++) { - if ((s = LHNET_OpenSocket_Connectionless(&address))) + if (LHNETADDRESS_FromString(&address, addressstring, port)) { - sv_sockets[sv_numsockets++] = s; - LHNETADDRESS_ToString(LHNET_AddressFromSocket(s), addressstring2, sizeof(addressstring2), true); - Con_Printf("Server listening on address %s\n", addressstring2); + 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); + break; + } + else + { + LHNETADDRESS_ToString(&address, addressstring2, sizeof(addressstring2), true); + Con_Printf("Server failed to open socket 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); + Con_Printf("Server unable to parse address %s\n", addressstring); + // if it cant parse one address, it wont be able to parse another for sure + break; } } - else - Con_Printf("Server unable to parse address %s\n", addressstring); } +static void NetConn_UpdateServerStuff(void); void NetConn_OpenServerPorts(int opennetports) { int port; NetConn_CloseServerPorts(); + NetConn_UpdateServerStuff(); port = bound(0, sv_netport.integer, 65535); if (port == 0) port = 26000; @@ -663,7 +711,7 @@ void NetConn_OpenServerPorts(int opennetports) //NetConn_OpenServerPort(net_address_ipv6.string, port); } if (sv_numsockets == 0) - Host_Error("NetConn_OpenServerPorts: unable to open any ports!\n"); + Host_Error("NetConn_OpenServerPorts: unable to open any ports!"); } lhnetsocket_t *NetConn_ChooseClientSocketForAddress(lhnetaddress_t *address) @@ -687,7 +735,7 @@ lhnetsocket_t *NetConn_ChooseServerSocketForAddress(lhnetaddress_t *address) netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress) { netconn_t *conn; - conn = Mem_Alloc(netconn_mempool, sizeof(*conn)); + conn = (netconn_t *)Mem_Alloc(netconn_mempool, sizeof(*conn)); conn->mysocket = mysocket; conn->peeraddress = *peeraddress; conn->canSend = true; @@ -755,19 +803,20 @@ static void NetConn_UpdateServerStuff(void) } } -int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) +int NetConn_ReceivedMessage(netconn_t *conn, unsigned char *data, int length) { unsigned int count; unsigned int flags; unsigned int sequence; + int qlength; if (length >= 8) { - length = BigLong(((int *)data)[0]); - flags = length & ~NETFLAG_LENGTH_MASK; - length &= NETFLAG_LENGTH_MASK; + qlength = (unsigned int)BigLong(((int *)data)[0]); + flags = qlength & ~NETFLAG_LENGTH_MASK; + qlength &= NETFLAG_LENGTH_MASK; // control packets were already handled - if (!(flags & NETFLAG_CTL)) + if (!(flags & NETFLAG_CTL) && qlength == length) { sequence = BigLong(((int *)data)[1]); packetsReceived++; @@ -835,14 +884,21 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length) unsigned int temppacket[2]; temppacket[0] = BigLong(8 | NETFLAG_ACK); temppacket[1] = BigLong(sequence); - NetConn_Write(conn->mysocket, (qbyte *)temppacket, 8, &conn->peeraddress); + NetConn_Write(conn->mysocket, (unsigned char *)temppacket, 8, &conn->peeraddress); if (sequence == conn->receiveSequence) { conn->lastMessageTime = realtime; conn->timeout = realtime + net_messagetimeout.value; conn->receiveSequence++; - memcpy(conn->receiveMessage + conn->receiveMessageLength, data, length); - conn->receiveMessageLength += length; + if( conn->receiveMessageLength + length <= (int)sizeof( conn->receiveMessage ) ) { + memcpy(conn->receiveMessage + conn->receiveMessageLength, data, length); + conn->receiveMessageLength += length; + } else { + Con_Printf( "Reliable message (seq: %i) too big for message buffer!\n" + "Dropping the message!\n", sequence ); + conn->receiveMessageLength = 0; + return 1; + } if (flags & NETFLAG_EOM) { reliableMessagesReceived++; @@ -872,6 +928,10 @@ void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peer M_Update_Return_Reason(""); // 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 + if (LHNETADDRESS_GetAddressType(peeraddress) != LHNETADDRESSTYPE_LOOP && sv.active) + Host_ShutdownServer (false); + // allocate a net connection to keep track of things cls.netcon = NetConn_Open(mysocket, peeraddress); Con_Printf("Connection accepted to %s\n", cls.netcon->address); key_dest = key_game; @@ -879,7 +939,6 @@ void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peer 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(); } int NetConn_IsLocalGame(void) @@ -889,10 +948,9 @@ int NetConn_IsLocalGame(void) return false; } -int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress) +int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress) { int ret, c, control; - lhnetaddress_t svaddress; const char *s; char *string, addressstring2[128], cname[128], ipstring[32]; char stringbuf[16384]; @@ -917,10 +975,12 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, if (length > 10 && !memcmp(string, "challenge ", 10) && cls.connect_trying) { + char protocolnames[1400]; + Protocol_Names(protocolnames, sizeof(protocolnames)); 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); + NetConn_WriteString(mysocket, va("\377\377\377\377connect\\protocol\\darkplaces 3\\protocols\\%s\\challenge\\%s", protocolnames, string + 10), peeraddress); return true; } if (length == 6 && !memcmp(string, "accept", 6) && cls.connect_trying) @@ -943,7 +1003,7 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, if (length >= 13 && !memcmp(string, "infoResponse\x0A", 13)) { serverlist_info_t *info; - int i, n; + int n; double pingtime; string += 13; @@ -953,8 +1013,26 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, for( n = 0; n < serverlist_cachecount; n++ ) if( !strcmp( cname, serverlist_cache[n].info.cname ) ) break; - if( n == serverlist_cachecount ) - return true; + if( n == serverlist_cachecount ) { + // LAN search doesnt require an answer from the master server so we wont + // know the ping nor will it be initialized already... + + // find a slot + if( serverlist_cachecount == SERVERLIST_TOTALSIZE ) + return true; + + memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount])); + // store the data the engine cares about (address and ping) + strlcpy (serverlist_cache[serverlist_cachecount].info.cname, cname, sizeof (serverlist_cache[serverlist_cachecount].info.cname)); + serverlist_cache[serverlist_cachecount].info.ping = 100000; + serverlist_cache[serverlist_cachecount].querytime = realtime; + // if not in the slist menu we should print the server to console + if (serverlist_consoleoutput) { + Con_Printf("querying %s\n", ipstring); + } + + ++serverlist_cachecount; + } info = &serverlist_cache[n].info; if ((s = SearchInfostring(string, "gamename" )) != NULL) strlcpy(info->game, s, sizeof (info->game));else info->game[0] = 0; @@ -976,31 +1054,17 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, // legacy/old stuff move it to the menu ASAP // build description strings for the things users care about - dpsnprintf(serverlist_cache[n].line1, sizeof(serverlist_cache[n].line1), "%5d%c%3u/%3u %-65.65s", (int)pingtime, info->protocol != NET_PROTOCOL_VERSION ? '*' : ' ', info->numplayers, info->maxplayers, info->name); + dpsnprintf(serverlist_cache[n].line1, sizeof(serverlist_cache[n].line1), "%c%c%5d%c%c%c%3u/%3u %-65.65s", STRING_COLOR_TAG, pingtime >= 300 ? '1' : (pingtime >= 200 ? '3' : '7'), (int)pingtime, STRING_COLOR_TAG, STRING_COLOR_DEFAULT + '0', info->protocol != NET_PROTOCOL_VERSION ? '*' : ' ', info->numplayers, info->maxplayers, info->name); dpsnprintf(serverlist_cache[n].line2, sizeof(serverlist_cache[n].line2), "%-21.21s %-19.19s %-17.17s %-20.20s", info->cname, info->game, info->mod, info->map); - // if ping is especially high, display it as such - if (pingtime >= 300) - { - // orange numbers (lower block) - for (i = 0;i < 5;i++) - if (serverlist_cache[n].line1[i] != ' ') - serverlist_cache[n].line1[i] += 128; + if( serverlist_cache[n].query == SQS_QUERIED ) { + ServerList_ViewList_Remove( &serverlist_cache[n] ); } - else if (pingtime >= 200) - { - // yellow numbers (in upper block) - for (i = 0;i < 5;i++) - if (serverlist_cache[n].line1[i] != ' ') - serverlist_cache[n].line1[i] -= 30; - } - // and finally, update the view set - if( serverlist_cache[n].finished ) - ServerList_ViewList_Remove( &serverlist_cache[n] ); - // else if not in the slist menu we should print the server to console (if wanted) + // if not in the slist menu we should print the server to console (if wanted) else if( serverlist_consoleoutput ) Con_Printf("%s\n%s\n", serverlist_cache[n].line1, serverlist_cache[n].line2); + // and finally, update the view set ServerList_ViewList_Insert( &serverlist_cache[n] ); - serverlist_cache[n].finished = true; + serverlist_cache[n].query = SQS_QUERIED; return true; } @@ -1016,8 +1080,6 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, { int n; - serverquerycount++; - dpsnprintf (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); @@ -1025,30 +1087,28 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, if( serverlist_cachecount == SERVERLIST_TOTALSIZE ) break; // also ignore it if we have already queried it (other master server response) - for( n = 0 ; n < serverlist_cachecount ; n++ ) + for( n = 0 ; n < serverlist_cachecount ; n++ ) if( !strcmp( ipstring, serverlist_cache[ n ].info.cname ) ) break; - if( n < serverlist_cachecount ) - break; - - LHNETADDRESS_FromString(&svaddress, ipstring, 0); - NetConn_WriteString(mysocket, "\377\377\377\377getinfo", &svaddress); + if( n >= serverlist_cachecount ) + { + serverquerycount++; - memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount])); - // store the data the engine cares about (address and ping) - strlcpy (serverlist_cache[serverlist_cachecount].info.cname, ipstring, sizeof (serverlist_cache[serverlist_cachecount].info.cname)); - serverlist_cache[serverlist_cachecount].info.ping = 100000; - serverlist_cache[serverlist_cachecount].querytime = realtime; - // if not in the slist menu we should print the server to console - if (serverlist_consoleoutput) - Con_Printf("querying %s\n", ipstring); + memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount])); + // store the data the engine cares about (address and ping) + strlcpy (serverlist_cache[serverlist_cachecount].info.cname, ipstring, sizeof (serverlist_cache[serverlist_cachecount].info.cname)); + serverlist_cache[serverlist_cachecount].info.ping = 100000; + serverlist_cache[serverlist_cachecount].query = SQS_QUERYING; - ++serverlist_cachecount; + ++serverlist_cachecount; + } // move on to next address in packet data += 7; length -= 7; } + // begin or resume serverlist queries + serverlist_querysleep = false; return true; } /* @@ -1097,7 +1157,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); cls.connect_trying = false; - M_Update_Return_Reason(data); + M_Update_Return_Reason((char *)data); break; #if 0 case CCREP_SERVER_INFO: @@ -1158,6 +1218,71 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, return ret; } +void NetConn_QueryQueueFrame(void) +{ + int index; + int queries; + int maxqueries; + double timeouttime; + static double querycounter = 0; + + if (serverlist_querysleep) + return; + + // each time querycounter reaches 1.0 issue a query + querycounter += host_realframetime * net_slist_queriespersecond.value; + maxqueries = (int)querycounter; + maxqueries = bound(0, maxqueries, net_slist_queriesperframe.integer); + querycounter -= maxqueries; + + if( maxqueries == 0 ) { + return; + } + + // scan serverlist and issue queries as needed + serverlist_querysleep = true; + + timeouttime = realtime - net_slist_timeout.value; + for( index = 0, queries = 0 ; index < serverlist_cachecount && queries < maxqueries ; index++ ) + { + serverlist_entry_t *entry = &serverlist_cache[ index ]; + if( entry->query != SQS_QUERYING ) + { + continue; + } + + serverlist_querysleep = false; + if( entry->querycounter != 0 && entry->querytime > timeouttime ) + { + continue; + } + + if( entry->querycounter != (unsigned) net_slist_maxtries.integer ) + { + lhnetaddress_t address; + int socket; + + LHNETADDRESS_FromString(&address, entry->info.cname, 0); + for (socket = 0; socket < cl_numsockets ; socket++) { + NetConn_WriteString(cl_sockets[socket], "\377\377\377\377getinfo", &address); + } + + entry->querytime = realtime; + entry->querycounter++; + + // if not in the slist menu we should print the server to console + if (serverlist_consoleoutput) + Con_Printf("querying %25s (%i. try)\n", entry->info.cname, entry->querycounter); + + queries++; + } + else + { + entry->query = SQS_TIMEDOUT; + } + } +} + void NetConn_ClientFrame(void) { int i, length; @@ -1167,13 +1292,15 @@ void NetConn_ClientFrame(void) if (cls.connect_trying && cls.connect_nextsendtime < realtime) { if (cls.connect_remainingtries == 0) + M_Update_Return_Reason("Connect: Waiting 10 seconds for reply"); + cls.connect_nextsendtime = realtime + 1; + cls.connect_remainingtries--; + if (cls.connect_remainingtries <= -10) { cls.connect_trying = false; M_Update_Return_Reason("Connect: Failed"); return; } - cls.connect_nextsendtime = realtime + 1; - cls.connect_remainingtries--; // try challenge first (newer server) NetConn_WriteString(cls.connect_mysocket, "\377\377\377\377getchallenge", &cls.connect_address); // then try netquake as a fallback (old server, or netquake) @@ -1187,9 +1314,12 @@ void NetConn_ClientFrame(void) NetConn_Write(cls.connect_mysocket, net_message.data, net_message.cursize, &cls.connect_address); SZ_Clear(&net_message); } - for (i = 0;i < cl_numsockets;i++) - while (cl_sockets[i] && (length = NetConn_Read(cl_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0) + for (i = 0;i < cl_numsockets;i++) { + while (cl_sockets[i] && (length = NetConn_Read(cl_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0) { NetConn_ClientParsePacket(cl_sockets[i], readbuffer, length, &peeraddress); + } + } + NetConn_QueryQueueFrame(); if (cls.netcon && realtime > cls.netcon->timeout) { Con_Print("Connection timed out\n"); @@ -1201,7 +1331,7 @@ void NetConn_ClientFrame(void) } #define MAX_CHALLENGES 128 -struct +struct challenge_s { lhnetaddress_t address; double time; @@ -1224,9 +1354,83 @@ static void NetConn_BuildChallengeString(char *buffer, int bufferlength) buffer[i] = 0; } -int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress) +static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg, size_t out_size, qboolean fullstatus) { - int i, n, ret, clientnum, responselength, best; + unsigned int nb_clients = 0, i; + int length; + + // How many clients are there? + for (i = 0;i < (unsigned int)svs.maxclients;i++) + if (svs.clients[i].active) + nb_clients++; + + // TODO: we should add more information for the full status string + length = dpsnprintf(out_msg, out_size, + "\377\377\377\377%s\x0A" + "\\gamename\\%s\\modname\\%s\\sv_maxclients\\%d" + "\\clients\\%d\\mapname\\%s\\hostname\\%s""\\protocol\\%d" + "%s%s" + "%s", + fullstatus ? "statusResponse" : "infoResponse", + gamename, com_modname, svs.maxclients, + nb_clients, sv.name, hostname.string, NET_PROTOCOL_VERSION, + challenge ? "\\challenge\\" : "", challenge ? challenge : "", + fullstatus ? "\n" : ""); + + // Make sure it fits in the buffer + if (length < 0) + return false; + + if (fullstatus) + { + char *ptr; + int left; + + ptr = out_msg + length; + left = (int)out_size - length; + + for (i = 0;i < (unsigned int)svs.maxclients;i++) + { + client_t *cl = &svs.clients[i]; + if (cl->active) + { + int nameind, cleanind; + char curchar; + char cleanname [sizeof(cl->name)]; + + // Remove all characters '"' and '\' in the player name + nameind = 0; + cleanind = 0; + do + { + curchar = cl->name[nameind++]; + if (curchar != '"' && curchar != '\\') + { + cleanname[cleanind++] = curchar; + if (cleanind == sizeof(cleanname) - 1) + break; + } + } while (curchar != '\0'); + + length = dpsnprintf(ptr, left, "%d %d \"%s\"\n", + cl->frags, + (int)(cl->ping * 1000.0f), + cleanname); + if(length < 0) + return false; + left -= length; + ptr += length; + } + } + } + + return true; +} + +extern void SV_SendServerinfo (client_t *client); +int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress) +{ + int i, ret, clientnum, best; double besttime; client_t *client; netconn_t *conn; @@ -1299,24 +1503,27 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, for (clientnum = 0, client = svs.clients;clientnum < svs.maxclients;clientnum++, client++) if (client->netconnection && LHNETADDRESS_Compare(peeraddress, &client->netconnection->peeraddress) == 0) break; - if (clientnum < svs.maxclients) + if (clientnum < svs.maxclients && realtime - client->connecttime < net_messagerejointimeout.value) + { + // client is still trying to connect, + // so we send a duplicate reply + if (developer.integer) + Con_Printf("Datagram_ParseConnectionless: sending duplicate accept to %s.\n", addressstring2); + NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress); + } +#if 0 + else if (clientnum < svs.maxclients) { - // duplicate connection request - if (realtime - client->connecttime < 2.0) - { - // client is still trying to connect, - // so we send a duplicate reply - if (developer.integer) - Con_Printf("Datagram_ParseConnectionless: sending duplicate accept to %s.\n", addressstring2); - NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress); - } - // only kick if old connection seems dead if (realtime - client->netconnection->lastMessageTime >= net_messagerejointimeout.value) { - // kick off connection and await retry - client->deadsocket = true; + // client crashed and is coming back, keep their stuff intact + SV_SendServerinfo(client); + //host_client = client; + //SV_DropClient (true); } + // else ignore them } +#endif else { // this is a new client, find a slot @@ -1354,19 +1561,12 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, if (length >= 7 && !memcmp(string, "getinfo", 7)) { const char *challenge = NULL; + // If there was a challenge in the getinfo message if (length > 8 && string[7] == ' ') challenge = string + 8; - for (i = 0, n = 0;i < svs.maxclients;i++) - if (svs.clients[i].active) - n++; - responselength = dpsnprintf(response, sizeof(response), "\377\377\377\377infoResponse\x0A" - "\\gamename\\%s\\modname\\%s\\sv_maxclients\\%d" - "\\clients\\%d\\mapname\\%s\\hostname\\%s\\protocol\\%d%s%s", - gamename, com_modname, svs.maxclients, n, - sv.name, hostname.string, NET_PROTOCOL_VERSION, challenge ? "\\challenge\\" : "", challenge ? challenge : ""); - // does it fit in the buffer? - if (responselength >= 0) + + if (NetConn_BuildStatusResponse(challenge, response, sizeof(response), false)) { if (developer.integer) Con_Printf("Sending reply to master %s - %s\n", addressstring2, response); @@ -1374,6 +1574,22 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, } return true; } + if (length >= 9 && !memcmp(string, "getstatus", 9)) + { + const char *challenge = NULL; + + // If there was a challenge in the getinfo message + if (length > 10 && string[9] == ' ') + challenge = string + 10; + + if (NetConn_BuildStatusResponse(challenge, response, sizeof(response), true)) + { + if (developer.integer) + Con_Printf("Sending reply to client %s - %s\n", addressstring2, response); + NetConn_WriteString(mysocket, response, peeraddress); + } + return true; + } /* if (!strncmp(string, "ping", 4)) { @@ -1444,13 +1660,17 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, NetConn_Write(mysocket, net_message.data, net_message.cursize, peeraddress); SZ_Clear(&net_message); } +#if 0 else if (realtime - client->netconnection->lastMessageTime >= net_messagerejointimeout.value) { + SV_SendServerinfo(client); // the old client hasn't sent us anything // in quite a while, so kick off and let // the retry take care of it... - client->deadsocket = true; + //host_client = client; + //SV_DropClient (true); } +#endif } else { @@ -1542,7 +1762,7 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, MSG_WriteByte(&net_message, playerNumber); MSG_WriteString(&net_message, client->name); MSG_WriteLong(&net_message, client->colors); - MSG_WriteLong(&net_message, (int)client->edict->v->frags); + MSG_WriteLong(&net_message, (int)client->edict->fields.server->frags); MSG_WriteLong(&net_message, (int)(realtime - client->connecttime)); MSG_WriteString(&net_message, client->netconnection ? client->netconnection->address : "botclient"); *((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK)); @@ -1712,7 +1932,7 @@ void NetConn_Heartbeat(int priority) int NetConn_SendToAll(sizebuf_t *data, double blocktime) { int i, count = 0; - qbyte sent[MAX_SCOREBOARD]; + unsigned char sent[MAX_SCOREBOARD]; memset(sent, 0, sizeof(sent)); @@ -1725,8 +1945,8 @@ int NetConn_SendToAll(sizebuf_t *data, double blocktime) do { count = 0; - NetConn_ClientFrame(); - NetConn_ServerFrame(); + // run a network frame to check for packets + NetConn_ClientFrame();SV_VM_Begin();NetConn_ServerFrame();SV_VM_End(); for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++) { if (host_client->netconnection) @@ -1794,10 +2014,14 @@ void NetConn_Init(void) { int i; lhnetaddress_t tempaddress; - 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); + netconn_mempool = Mem_AllocPool("network connections", 0, NULL); + Cmd_AddCommand("net_stats", Net_Stats_f, "print network statistics"); + Cmd_AddCommand("net_slist", Net_Slist_f, "query master series and print all server information"); + Cmd_AddCommand("heartbeat", Net_Heartbeat_f, "send a heartbeat to the master server (updates your server information)"); + Cvar_RegisterVariable(&net_slist_queriespersecond); + Cvar_RegisterVariable(&net_slist_queriesperframe); + Cvar_RegisterVariable(&net_slist_timeout); + Cvar_RegisterVariable(&net_slist_maxtries); Cvar_RegisterVariable(&net_messagetimeout); Cvar_RegisterVariable(&net_messagerejointimeout); Cvar_RegisterVariable(&net_connecttimeout); @@ -1838,7 +2062,9 @@ void NetConn_Init(void) } cl_numsockets = 0; sv_numsockets = 0; - SZ_Alloc(&net_message, NET_MAXMESSAGE, "net_message"); + net_message.data = net_message_buf; + net_message.maxsize = sizeof(net_message_buf); + net_message.cursize = 0; LHNET_Init(); }