changed main() argv parameter to non-const, and casting it to const on assignment...

[xonotic/darkplaces.git] / netconn.c

diff --git a/netconn.c b/netconn.c
index 3765ef280b60cb54ebdcb32fa520ef5c600e1244..2c7f0cae03e872acb0a90df28fb49e6c6fa16599 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -49,12 +49,8 @@ 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_min = {0, "cl_netlocalping_min","0"};
-cvar_t cl_netlocalping_max = {0, "cl_netlocalping_max","0"};
-static cvar_t cl_netpacketloss_receive = {0, "cl_netpacketloss_receive","0"};
-static cvar_t cl_netpacketloss_send = {0, "cl_netpacketloss_send","0"};
-static cvar_t sv_netpacketloss_receive = {0, "sv_netpacketloss_receive","0"};
-static cvar_t sv_netpacketloss_send = {0, "sv_netpacketloss_send","0"};
+cvar_t cl_netlocalping = {0, "cl_netlocalping","0"};
+static cvar_t cl_netpacketloss = {0, "cl_netpacketloss","0"};
 
 
 /* statistic counters */
@@ -98,13 +94,9 @@ int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddres
 {
        int length = LHNET_Read(mysocket, data, maxlength, peeraddress);
        int i;
-       if (cl_netpacketloss_receive.integer)
+       if (cl_netpacketloss.integer)
                for (i = 0;i < cl_numsockets;i++)
-                       if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss_receive.integer)
-                               return 0;
-       if (sv_netpacketloss_receive.integer)
-               for (i = 0;i < cl_numsockets;i++)
-                       if (sv_sockets[i] == mysocket && (rand() % 100) < sv_netpacketloss_receive.integer)
+                       if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss.integer)
                                return 0;
        if (developer_networking.integer && length != 0)
        {
@@ -126,13 +118,9 @@ int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const l
 {
        int ret;
        int i;
-       if (cl_netpacketloss_send.integer)
+       if (cl_netpacketloss.integer)
                for (i = 0;i < cl_numsockets;i++)
-                       if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss_send.integer)
-                               return length;
-       if (sv_netpacketloss_send.integer)
-               for (i = 0;i < cl_numsockets;i++)
-                       if (sv_sockets[i] == mysocket && (rand() % 100) < sv_netpacketloss_send.integer)
+                       if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss.integer)
                                return length;
        ret = LHNET_Write(mysocket, data, length, peeraddress);
        if (developer_networking.integer)
@@ -616,6 +604,7 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length)
 void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress)
 {
        cls.connect_trying = false;
+       M_Update_Return_Reason("");
        // the connection request succeeded, stop current connection and set up a new connection
        CL_Disconnect();
        cls.netcon = NetConn_Open(mysocket, peeraddress);
@@ -673,22 +662,25 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
                {
                        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);
                        return true;
                }
                if (length == 6 && !memcmp(string, "accept", 6) && cls.connect_trying)
                {
+                       M_Update_Return_Reason("Accepted");
                        NetConn_ConnectionEstablished(mysocket, peeraddress);
                        return true;
                }
                if (length > 7 && !memcmp(string, "reject ", 7) && cls.connect_trying)
                {
+                       char rejectreason[32];
                        cls.connect_trying = false;
                        string += 7;
-                       length = max(length - 7, (int)sizeof(m_return_reason) - 1);
-                       memcpy(m_return_reason, string, length);
-                       m_return_reason[length] = 0;
-                       Con_Printf("%s\n", m_return_reason);
+                       length = max(length - 7, (int)sizeof(rejectreason) - 1);
+                       memcpy(rejectreason, string, length);
+                       rejectreason[length] = 0;
+                       M_Update_Return_Reason(rejectreason);
                        return true;
                }
                if (length >= 13 && !memcmp(string, "infoResponse\x0A", 13))
@@ -867,14 +859,15 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
                                        length -= 4;
                                        LHNETADDRESS_SetPort(&clientportaddress, port);
                                }
+                               M_Update_Return_Reason("Accepted");
                                NetConn_ConnectionEstablished(mysocket, &clientportaddress);
                        }
                        break;
                case CCREP_REJECT:
                        if (developer.integer)
                                Con_Printf("Datagram_ParseConnectionless: received CCREP_REJECT from %s.\n", addressstring2);
-                       Con_Printf("%s\n", data);
-                       strlcpy (m_return_reason, data, sizeof (m_return_reason));
+                       cls.connect_trying = false;
+                       M_Update_Return_Reason(data);
                        break;
 #if 0
                case CCREP_SERVER_INFO:
@@ -946,26 +939,9 @@ void NetConn_ClientFrame(void)
                if (cls.connect_remainingtries == 0)
                {
                        cls.connect_trying = false;
-                       if (m_state == m_slist)
-                               strcpy (m_return_reason, "Connect: Failed");
-                       else
-                               Con_Print("Connect failed\n");
+                       M_Update_Return_Reason("Connect: Failed");
                        return;
                }
-               if (cls.connect_nextsendtime)
-               {
-                       if (m_state == m_slist)
-                               strcpy (m_return_reason, "Connect: Still trying");
-                       else
-                               Con_Print("Still trying...\n");
-               }
-               else
-               {
-                       if (m_state == m_slist)
-                               strcpy (m_return_reason, "Connect: Trying");
-                       else
-                               Con_Print("Trying...\n");
-               }
                cls.connect_nextsendtime = realtime + 1;
                cls.connect_remainingtries--;
                // try challenge first (newer server)
@@ -1468,7 +1444,7 @@ void NetConn_QueryMasters(void)
        if (!masterquerycount)
        {
                Con_Print("Unable to query master servers, no suitable network sockets active.\n");
-               strcpy(m_return_reason, "No network");
+               M_Update_Return_Reason("No network");
        }
 }
 
@@ -1597,12 +1573,8 @@ void NetConn_Init(void)
        Cvar_RegisterVariable(&net_messagetimeout);
        Cvar_RegisterVariable(&net_messagerejointimeout);
        Cvar_RegisterVariable(&net_connecttimeout);
-       Cvar_RegisterVariable(&cl_netlocalping_min);
-       Cvar_RegisterVariable(&cl_netlocalping_max);
-       Cvar_RegisterVariable(&cl_netpacketloss_receive);
-       Cvar_RegisterVariable(&cl_netpacketloss_send);
-       Cvar_RegisterVariable(&sv_netpacketloss_receive);
-       Cvar_RegisterVariable(&sv_netpacketloss_send);
+       Cvar_RegisterVariable(&cl_netlocalping);
+       Cvar_RegisterVariable(&cl_netpacketloss);
        Cvar_RegisterVariable(&hostname);
        Cvar_RegisterVariable(&developer_networking);
        Cvar_RegisterVariable(&cl_netport);