fixed r_showtris bug (individual state changes were not being ignored in showtris...

[xonotic/darkplaces.git] / netconn.c

diff --git a/netconn.c b/netconn.c
index 307ae43d861f4c26ec4962df857d22c4d8a3e86b..767e9da9c5daacfc97196398785c1ab2c5664ff7 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -37,7 +37,7 @@ static cvar_t sv_masters [] =
        {CVAR_SAVE, "sv_master4", ""},
        {0, "sv_masterextra1", "ghdigital.com"}, //69.59.212.88
        {0, "sv_masterextra2", "dpmaster.deathmask.net"}, //209.164.24.243
-       {0, "sv_masterextra3", "blaze.mindphukd.org"}, //12.166.196.192
+       {0, "sv_masterextra3", "12.166.196.192"}, //blaze.mindphukd.org (doesn't resolve currently but works as an ip)
        {0, NULL, NULL}
 };
 
@@ -1228,6 +1228,7 @@ static void NetConn_BuildChallengeString(char *buffer, int bufferlength)
        buffer[i] = 0;
 }
 
+extern void SV_SendServerinfo (client_t *client);
 int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress)
 {
        int i, n, ret, clientnum, responselength, best;
@@ -1303,24 +1304,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
@@ -1448,13 +1452,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
                                                        {