Thanks to faded (of the tenebrae team) for provoking me to recite a lengthy explanati...

[xonotic/darkplaces.git] / net_master.c

diff --git a/net_master.c b/net_master.c
index 6aa7499cec586ce2bfcf7a94c47c8e428a6c1f77..c8cefb66f3b3dcc545128f7d7f432458be600ee9 100644 (file)
--- a/net_master.c
+++ b/net_master.c
@@ -27,11 +27,13 @@ cvar_t sv_heartbeatperiod = {CVAR_SAVE, "sv_heartbeatperiod", "180"};
 
 cvar_t sv_masters [] =
 {
-       {0, "sv_masterextra1", "68.102.242.12"},
        {CVAR_SAVE, "sv_master1", ""},
        {CVAR_SAVE, "sv_master2", ""},
        {CVAR_SAVE, "sv_master3", ""},
-       {CVAR_SAVE, "sv_master4", ""}
+       {CVAR_SAVE, "sv_master4", ""},
+       {0, "sv_masterextra1", "rick.cube-sol.net"},
+       {0, "sv_masterextra2", "198.88.152.4"},
+       {0, "sv_masterextra3", "68.102.242.12"}
 };
 
 static double nextheartbeattime = 0;
@@ -85,19 +87,23 @@ const char* Master_BuildGetServers (void)
        cvar_t* sv_master;
        char request [256];
 
-       if (nextmaster >= sizeof (sv_masters) / sizeof (sv_masters[0]))
+       if (nextmaster >= (int)(sizeof (sv_masters) / sizeof (sv_masters[0])))
        {
                nextmaster = 0;
                return NULL;
        }
 
-       sv_master = &sv_masters[nextmaster++];
-
-       // No master, no heartbeat
-       if (sv_master->string[0] == '\0')
+       // find a non-empty master server address in the list
+       for(;;)
        {
-               nextmaster = 0;
-               return NULL;
+               sv_master = &sv_masters[nextmaster++];
+               if (sv_master->string[0])
+                       break;
+               if (nextmaster >= (int)(sizeof (sv_masters) / sizeof (sv_masters[0])))
+               {
+                       nextmaster = 0;
+                       return NULL;
+               }
        }
 
        // Build the heartbeat
@@ -123,20 +129,24 @@ const char* Master_BuildHeartbeat (void)
 {
        static int nextmaster = 0;
        cvar_t* sv_master;
-       
-       if (nextmaster >= sizeof (sv_masters) / sizeof (sv_masters[0]))
+
+       if (nextmaster >= (int)(sizeof (sv_masters) / sizeof (sv_masters[0])))
        {
                nextmaster = 0;
                return NULL;
        }
 
-       sv_master = &sv_masters[nextmaster++];
-
-       // No master, no heartbeat
-       if (sv_master->string[0] == '\0')
+       // find a non-empty master server address in the list
+       for(;;)
        {
-               nextmaster = 0;
-               return NULL;
+               sv_master = &sv_masters[nextmaster++];
+               if (sv_master->string[0])
+                       break;
+               if (nextmaster >= (int)(sizeof (sv_masters) / sizeof (sv_masters[0])))
+               {
+                       nextmaster = 0;
+                       return NULL;
+               }
        }
 
        // Build the heartbeat
@@ -222,56 +232,52 @@ void Master_Init (void)
 Master_ParseServerList
 
 Parse getserverResponse messages
+Returns true if it was a valid getserversResponse
 ====================
 */
-void Master_ParseServerList (net_landriver_t* dfunc)
+int Master_ParseServerList (net_landriver_t* dfunc)
 {
+       int servercount = 0;
        int control;
        qbyte* servers;
        qbyte* crtserver;
-       int ipaddr;
        struct qsockaddr svaddr;
        char ipstring [32];
+       char string[32];
+
+       if (developer.integer)
+       {
+               Con_Printf("Master_ParseServerList: packet received:\n");
+               SZ_HexDumpToConsole(&net_message);
+       }
 
-       if (net_message.cursize < sizeof(int))
-               return;
+       if (net_message.cursize < 23)
+               return 0;
 
        // is the cache full?
        if (hostCacheCount == HOSTCACHESIZE)
-               return;
+               return 0;
 
        MSG_BeginReading ();
-       control = BigLong(*((int *)net_message.data));
-       MSG_ReadLong();
+       control = MSG_ReadBigLong();
        if (control != -1)
-               return;
-
-       if (strncmp (net_message.data + 4, "getserversResponse\\", 19)) 
-               return;
+               return 0;
 
-       // Skip the next 19 bytes
-       MSG_ReadLong(); MSG_ReadLong(); MSG_ReadLong(); MSG_ReadLong();
-       MSG_ReadShort(); MSG_ReadByte();
+       if (MSG_ReadBytes(19, string) < 19 || memcmp(string, "getserversResponse\\", 19))
+               return 0;
 
        crtserver = servers = Z_Malloc (net_message.cursize - 23);
        memcpy (servers , net_message.data + 23, net_message.cursize - 23);
 
        // Extract the IP addresses
-       while ((ipaddr = (crtserver[3] << 24) | (crtserver[2] << 16) | (crtserver[1] << 8) | crtserver[0]) != -1)
+       while ((crtserver[0] != 0xFF || crtserver[1] != 0xFF || crtserver[2] != 0xFF || crtserver[3] != 0xFF) && (crtserver[4] != 0 || crtserver[5] != 0))
        {
-               int port = (crtserver[5] << 8) | crtserver[4];
-
-               if (port == -1 || port == 0)
-                       break;
-
-               port = ((port >> 8) & 0xFF) + ((port & 0xFF) << 8);
-               sprintf (ipstring, "%u.%u.%u.%u:%hu",
-                                       ipaddr & 0xFF, (ipaddr >> 8) & 0xFF,
-                                       (ipaddr >> 16) & 0xFF, ipaddr >> 24,
-                                       port);
+               // LordHavoc: FIXME: this could be much faster than converting to a string and back
+               // LordHavoc: FIXME: this code is very UDP specific, perhaps it should be part of net_udp?
+               sprintf (ipstring, "%u.%u.%u.%u:%u", crtserver[0], crtserver[1], crtserver[2], crtserver[3], (crtserver[4] << 8) | crtserver[5]);
                dfunc->GetAddrFromName (ipstring, &svaddr);
-
                Con_DPrintf("Requesting info from server %s\n", ipstring);
+
                // Send a request at this address
                SZ_Clear(&net_message);
                MSG_WriteLong(&net_message, 0);  // save space for the header, filled in later
@@ -282,10 +288,14 @@ void Master_ParseServerList (net_landriver_t* dfunc)
                dfunc->Write(dfunc->controlSock, net_message.data, net_message.cursize, &svaddr);
                SZ_Clear(&net_message);
 
+               servercount++;
+
                if (crtserver[6] != '\\')
                        break;
                crtserver += 7;
        }
 
        Z_Free (servers);
+
+       return servercount;
 }