MSVC has a pathetic stack size.

[xonotic/darkplaces.git] / net_master.c

diff --git a/net_master.c b/net_master.c
index 8fd7ed8c46bd6e5c4f6915802bf0cfdc8559df35..53bf2ff0d265c2fd967aecd1d675e4da93ca1b6d 100644 (file)
--- a/net_master.c
+++ b/net_master.c
@@ -19,9 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // net_master.c
 
-#include <malloc.h>
 #include "quakedef.h"
 
+
 cvar_t sv_masters [] =
 {
        {CVAR_SAVE, "sv_master1", ""},
@@ -30,6 +30,47 @@ cvar_t sv_masters [] =
        {CVAR_SAVE, "sv_master4", ""}
 };
 
+static qboolean masteravailable = false;
+static double nextheartbeattime = 0;
+static unsigned int nbtries = 6;
+
+
+/*
+====================
+Master_AllowHeartbeat
+
+Allow (or not) NET_Heartbeat to proceed depending on various factors
+====================
+*/
+qboolean Master_AllowHeartbeat (int priority)
+{
+       // We try "nbtries" times to contact a master server before giving up
+       if (! masteravailable)
+       {
+               if (!nbtries || realtime < nextheartbeattime)
+                       return false;
+
+               nbtries--;
+       }
+       else
+       {
+               // if it's a state change, it can wait a little bit (30 sec max for now)
+               if (priority == 1 && nextheartbeattime - realtime > 30.0)
+               {
+                       nextheartbeattime = realtime + 30.0;
+                       return false;
+               }
+
+               if (priority <= 1 && realtime < nextheartbeattime)
+                       return false;
+       }
+
+       // send an heartbeat every 3 minutes by default (every 5 sec if we haven't yet found a master server)
+       // TODO: some cvars would be better than hardcoded values
+       nextheartbeattime = realtime + (masteravailable ? (3.0 * 60.0) : 5.0);
+       return true;
+}
+
 
 /*
 ====================
@@ -38,7 +79,7 @@ Master_BuildGetServers
 Build a getservers request for a master server
 ====================
 */
-char* Master_BuildGetServers (void)
+const char* Master_BuildGetServers (void)
 {
        static int nextmaster = 0;
        cvar_t* sv_master;
@@ -78,7 +119,7 @@ Master_BuildHeartbeat
 Build an heartbeat for a master server
 ====================
 */
-char* Master_BuildHeartbeat (void)
+const char* Master_BuildHeartbeat (void)
 {
        static int nextmaster = 0;
        cvar_t* sv_master;
@@ -126,6 +167,8 @@ int Master_HandleMessage (void)
                char response [512];
                size_t length;
 
+               masteravailable = true;
+
                length = snprintf (response, sizeof (response), "infoResponse\x0A"
                                        "\\gamename\\%s\\modname\\%s\\sv_maxclients\\%d"
                                        "\\clients\\%d\\mapname\\%s\\hostname\\%s\\protocol\\%d",
@@ -185,6 +228,7 @@ void Master_ParseServerList (net_landriver_t* dfunc)
 {
        int control;
        qbyte* servers;
+       qbyte* crtserver;
        int ipaddr;
        struct qsockaddr svaddr;
        char ipstring [32];
@@ -205,17 +249,17 @@ void Master_ParseServerList (net_landriver_t* dfunc)
        if (strncmp (net_message.data + 4, "getserversResponse\\", 19)) 
                return;
 
-       // Skip the next 18 bytes
+       // Skip the next 19 bytes
        MSG_ReadLong(); MSG_ReadLong(); MSG_ReadLong(); MSG_ReadLong();
        MSG_ReadShort(); MSG_ReadByte();
 
-       servers = alloca (net_message.cursize - 23);
+       crtserver = servers = Z_Malloc (net_message.cursize - 23);
        memcpy (servers , net_message.data + 23, net_message.cursize - 23);
 
        // Extract the IP addresses
-       while ((ipaddr = (servers[3] << 24) + (servers[2] << 16) + (servers[1] << 8) + servers[0]) != -1)
+       while ((ipaddr = (crtserver[3] << 24) | (crtserver[2] << 16) | (crtserver[1] << 8) | crtserver[0]) != -1)
        {
-               int port = (servers[5] << 8) + servers[4];
+               int port = (crtserver[5] << 8) | crtserver[4];
 
                if (port == -1 || port == 0)
                        break;
@@ -238,8 +282,10 @@ void Master_ParseServerList (net_landriver_t* dfunc)
                dfunc->Write(dfunc->controlSock, net_message.data, net_message.cursize, &svaddr);
                SZ_Clear(&net_message);
 
-               if (servers[6] != '\\')
+               if (crtserver[6] != '\\')
                        break;
-               servers += 7;
+               crtserver += 7;
        }
+
+       Z_Free (servers);
 }