dlights using light_lev now need the PFLAG_FULLDYNAMIC flag set to operate, otherwise...

[xonotic/darkplaces.git] / netconn.c

diff --git a/netconn.c b/netconn.c
index a855f4b7b45560c986df0e9abdaa2e8cbd9290af..a9c1963db9b5ac8b02b285e70c95968f6f9ab7e0 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -35,6 +35,7 @@ static cvar_t sv_masters [] =
        {CVAR_SAVE, "sv_master3", ""},
        {CVAR_SAVE, "sv_master4", ""},
        {0, "sv_masterextra1", "69.59.212.88"},
+       {0, "sv_masterextra2", "66.28.32.64"},
        {0, NULL, NULL}
 };
 
@@ -77,8 +78,8 @@ int serverreplycount = 0;
 int hostCacheCount = 0;
 hostcache_t hostcache[HOSTCACHESIZE];
 
-static qbyte sendbuffer[NET_MAXMESSAGE];
-static qbyte readbuffer[NET_MAXMESSAGE];
+static qbyte sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE];
+static qbyte readbuffer[NET_HEADERSIZE+NET_MAXMESSAGE];
 
 int cl_numsockets;
 lhnetsocket_t *cl_sockets[16];
@@ -89,12 +90,9 @@ netconn_t *netconn_list = NULL;
 mempool_t *netconn_mempool = NULL;
 
 cvar_t cl_netport = {0, "cl_port", "0"};
-cvar_t cl_netaddress = {0, "cl_netaddress", "0.0.0.0"};
-//cvar_t cl_netaddress_ipv6 = {0, "cl_netaddress_ipv6", "[0:0:0:0:0:0:0:0]:0"};
-
 cvar_t sv_netport = {0, "port", "26000"};
-cvar_t sv_netaddress = {0, "sv_netaddress", "0.0.0.0"};
-//cvar_t sv_netaddress_ipv6 = {0, "sv_netaddress_ipv6", "[0:0:0:0:0:0:0:0]: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]"};
 
 int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddress_t *peeraddress)
 {
@@ -165,8 +163,8 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data)
        if (data->cursize == 0)
                Sys_Error("Datagram_SendMessage: zero length message\n");
 
-       if (data->cursize > NET_MAXMESSAGE)
-               Sys_Error("Datagram_SendMessage: message too big %u\n", data->cursize);
+       if (data->cursize > (int)sizeof(conn->sendMessage))
+               Sys_Error("Datagram_SendMessage: message too big (%u > %u)\n", data->cursize, sizeof(conn->sendMessage));
 
        if (conn->canSend == false)
                Sys_Error("SendMessage: called with canSend == false\n");
@@ -191,7 +189,7 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data)
        header = (void *)sendbuffer;
        header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
        header[1] = BigLong(conn->sendSequence);
-       memcpy(sendbuffer + 8, conn->sendMessage, dataLen);
+       memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
 
        conn->sendSequence++;
        conn->canSend = false;
@@ -230,7 +228,7 @@ static void NetConn_SendMessageNext(netconn_t *conn)
                header = (void *)sendbuffer;
                header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
                header[1] = BigLong(conn->sendSequence);
-               memcpy(sendbuffer + 8, conn->sendMessage, dataLen);
+               memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
 
                conn->sendSequence++;
                conn->sendNext = false;
@@ -268,7 +266,7 @@ static void NetConn_ReSendMessage(netconn_t *conn)
                header = (void *)sendbuffer;
                header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
                header[1] = BigLong(conn->sendSequence - 1);
-               memcpy(sendbuffer + 8, conn->sendMessage, dataLen);
+               memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
 
                conn->sendNext = false;
 
@@ -290,20 +288,20 @@ int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data)
        int packetLen;
        int *header;
 
-#ifdef DEBUG
+       packetLen = NET_HEADERSIZE + data->cursize;
+
+//#ifdef DEBUG
        if (data->cursize == 0)
                Sys_Error("Datagram_SendUnreliableMessage: zero length message\n");
 
-       if (data->cursize > MAX_DATAGRAM)
+       if (packetLen > (int)sizeof(sendbuffer))
                Sys_Error("Datagram_SendUnreliableMessage: message too big %u\n", data->cursize);
-#endif
-
-       packetLen = NET_HEADERSIZE + data->cursize;
+//#endif
 
        header = (void *)sendbuffer;
        header[0] = BigLong(packetLen | NETFLAG_UNRELIABLE);
        header[1] = BigLong(conn->unreliableSendSequence);
-       memcpy(sendbuffer + 8, data->data, data->cursize);
+       memcpy(sendbuffer + NET_HEADERSIZE, data->data, data->cursize);
 
        conn->unreliableSendSequence++;
 
@@ -353,9 +351,9 @@ void NetConn_OpenClientPorts(void)
        if (cl_netport.integer != port)
                Cvar_SetValueQuick(&cl_netport, port);
        Con_Printf("Client using port %i\n", port);
-       NetConn_OpenClientPort("local", port);
-       NetConn_OpenClientPort(cl_netaddress.string, port);
-       //NetConn_OpenClientPort(cl_netaddress_ipv6.string, port);
+       NetConn_OpenClientPort("local:2", 0);
+       NetConn_OpenClientPort(net_address.string, port);
+       //NetConn_OpenClientPort(net_address_ipv6.string, port);
 }
 
 void NetConn_CloseServerPorts(void)
@@ -399,11 +397,11 @@ void NetConn_OpenServerPorts(int opennetports)
        if (sv_netport.integer != port)
                Cvar_SetValueQuick(&sv_netport, port);
        if (cls.state != ca_dedicated)
-               NetConn_OpenServerPort("local", port);
+               NetConn_OpenServerPort("local:1", 0);
        if (opennetports)
        {
-               NetConn_OpenServerPort(sv_netaddress.string, port);
-               //NetConn_OpenServerPort(sv_netaddress_ipv6.string, port);
+               NetConn_OpenServerPort(net_address.string, port);
+               //NetConn_OpenServerPort(net_address_ipv6.string, port);
        }
        if (sv_numsockets == 0)
                Host_Error("NetConn_OpenServerPorts: unable to open any ports!\n");
@@ -433,6 +431,11 @@ netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress)
        conn = Mem_Alloc(netconn_mempool, sizeof(*conn));
        conn->mysocket = mysocket;
        conn->peeraddress = *peeraddress;
+       // updated by receiving "rate" command from client
+       conn->rate = NET_MINRATE;
+       // no limits for local player
+       if (LHNETADDRESS_GetAddressType(peeraddress) == LHNETADDRESSTYPE_LOOP)
+               conn->rate = 1000000000;
        conn->canSend = true;
        conn->connecttime = realtime;
        conn->lastMessageTime = realtime;
@@ -1605,11 +1608,9 @@ void NetConn_Init(void)
        Cvar_RegisterVariable(&hostname);
        Cvar_RegisterVariable(&developer_networking);
        Cvar_RegisterVariable(&cl_netport);
-       Cvar_RegisterVariable(&cl_netaddress);
-       //Cvar_RegisterVariable(&cl_netaddress_ipv6);
        Cvar_RegisterVariable(&sv_netport);
-       Cvar_RegisterVariable(&sv_netaddress);
-       //Cvar_RegisterVariable(&sv_netaddress_ipv6);
+       Cvar_RegisterVariable(&net_address);
+       //Cvar_RegisterVariable(&net_address_ipv6);
        Cvar_RegisterVariable(&sv_public);
        Cvar_RegisterVariable(&sv_heartbeatperiod);
        for (i = 0;sv_masters[i].name;i++)
@@ -1618,9 +1619,8 @@ void NetConn_Init(void)
        {
                if (LHNETADDRESS_FromString(&tempaddress, com_argv[i + 1], 0) == 1)
                {
-                       Con_Printf("-ip option used, setting cl_netaddress and sv_netaddress to address \"%s\"\n");
-                       Cvar_SetQuick(&cl_netaddress, com_argv[i + 1]);
-                       Cvar_SetQuick(&sv_netaddress, com_argv[i + 1]);
+                       Con_Printf("-ip option used, setting net_address to \"%s\"\n");
+                       Cvar_SetQuick(&net_address, com_argv[i + 1]);
                }
                else
                        Con_Printf("-ip option used, but unable to parse the address \"%s\"\n", com_argv[i + 1]);