made CL_ExpandEntities cause an error if called before cl_entities is initialized

[xonotic/darkplaces.git] / lhnet.c

diff --git a/lhnet.c b/lhnet.c
index 34052e14c55708895cafead6f5e51c1b5aaed1d8..8c9c845562355afcd9700d09b0ff12dc77d69510 100644 (file)
--- a/lhnet.c
+++ b/lhnet.c
@@ -8,13 +8,13 @@
 #ifdef WIN32
 #include <winsock.h>
 #else
-#include <netdb.h>
-#include <netinet/in.h>
-//#include <arpa/inet.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #endif
 
 // for Z_Malloc/Z_Free in quake
@@ -24,6 +24,8 @@
 #include "sys.h"
 #include "netconn.h"
 #else
+#define Con_Print printf
+#define Con_Printf printf
 #define Z_Malloc malloc
 #define Z_Free free
 #endif
@@ -345,9 +347,9 @@ static const char *LHNETPRIVATE_StrError(void)
        int i = WSAGetLastError();
        switch (i)
        {
-               case WSAEINTR:           return "WSAEINTR";                                     
+               case WSAEINTR:           return "WSAEINTR";
                case WSAEBADF:           return "WSAEBADF";
-               case WSAEACCES:          return "WSAEACCES";          
+               case WSAEACCES:          return "WSAEACCES";
                case WSAEFAULT:          return "WSAEFAULT";
                case WSAEINVAL:          return "WSAEINVAL";
                case WSAEMFILE:          return "WSAEMFILE";
@@ -390,7 +392,7 @@ static const char *LHNETPRIVATE_StrError(void)
                case WSAEREMOTE:         return "WSAEREMOTE";
                case WSAEDISCON:         return "WSAEDISCON";
                case 0:                  return "no error";
-               default:                 return "unknown WSAE error";  
+               default:                 return "unknown WSAE error";
        }
 #else
        return strerror(errno);
@@ -444,17 +446,10 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
                case LHNETADDRESSTYPE_INET4:
                case LHNETADDRESSTYPE_INET6:
 #ifdef WIN32
-                       if (!lhnet_didWSAStartup && !WSAStartup(MAKEWORD(1, 1), &lhnet_winsockdata))
-                       {
-                               lhnet_didWSAStartup = 1;
-#else
+                       if (lhnet_didWSAStartup || (lhnet_didWSAStartup = !WSAStartup(MAKEWORD(1, 1), &lhnet_winsockdata)))
                        {
 #endif
-                               if (address->addresstype == LHNETADDRESSTYPE_INET6)
-                                       lhnetsocket->inetsocket = socket(LHNETADDRESSTYPE_INET6_FAMILY, SOCK_DGRAM, IPPROTO_UDP);
-                               else
-                                       lhnetsocket->inetsocket = socket(LHNETADDRESSTYPE_INET4_FAMILY, SOCK_DGRAM, IPPROTO_UDP);
-                               if (lhnetsocket->inetsocket != -1)
+                               if ((lhnetsocket->inetsocket = socket(address->addresstype == LHNETADDRESSTYPE_INET6 ? LHNETADDRESSTYPE_INET6_FAMILY : LHNETADDRESSTYPE_INET4_FAMILY, SOCK_DGRAM, IPPROTO_UDP)) != -1)
                                {
 #ifdef WIN32
                                        u_long _true = 1;
@@ -464,8 +459,18 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
                                        if (ioctl(lhnetsocket->inetsocket, FIONBIO, &_true) != -1)
 #endif
                                        {
-                                               if (bind(lhnetsocket->inetsocket, (void *)&lhnetsocket->address.addressdata, address->addresstype == LHNETADDRESSTYPE_INET6 ? sizeof(lhnetsocket->address.addressdata.inet6) : sizeof(lhnetsocket->address.addressdata.inet4)) != -1)
+#ifdef WIN32
+                                               int namelen;
+#else
+                                               socklen_t namelen;
+#endif
+                                               namelen = address->addresstype == LHNETADDRESSTYPE_INET6 ? sizeof(lhnetsocket->address.addressdata.inet6) : sizeof(lhnetsocket->address.addressdata.inet4);
+                                               if (bind(lhnetsocket->inetsocket, (void *)&lhnetsocket->address.addressdata, namelen) != -1)
                                                {
+                                                       int i = 1;
+                                                       getsockname(lhnetsocket->inetsocket, (void *)&lhnetsocket->address.addressdata, &namelen);
+                                                       // enable broadcast on this socket
+                                                       setsockopt(lhnetsocket->inetsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i));
                                                        lhnetsocket->next = &lhnet_socketlist;
                                                        lhnetsocket->prev = lhnetsocket->next->prev;
                                                        lhnetsocket->next->prev = lhnetsocket;
@@ -485,7 +490,11 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
                                }
                                else
                                        Con_Printf("LHNET_OpenSocket_Connectionless: socket returned error: %s\n", LHNETPRIVATE_StrError());
+#ifdef WIN32
                        }
+                       else
+                               Con_Print("LHNET_OpenSocket_Connectionless: WSAStartup failed\n");
+#endif
                        break;
                default:
                        break;
@@ -559,7 +568,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                                continue;
                        }
 #ifndef STANDALONETEST
-                       if (p->sentdoubletime && Sys_DoubleTime() < p->sentdoubletime)
+                       if (cl_netlocalping.value && (Sys_DoubleTime() - cl_netlocalping.value * (1.0 / 1000.0)) < p->sentdoubletime)
                                continue;
 #endif
                        if (value == 0 && p->destinationport == lhnetsocket->address.addressdata.loop.port)
@@ -600,7 +609,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                        switch (e)
                        {
                                case WSAECONNREFUSED:
-                                       Con_Printf("Connection refused\n");
+                                       Con_Print("Connection refused\n");
                                        return 0;
                        }
 #else
@@ -609,7 +618,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                        switch (errno)
                        {
                                case ECONNREFUSED:
-                                       Con_Printf("Connection refused\n");
+                                       Con_Print("Connection refused\n");
                                        return 0;
                        }
 #endif
@@ -635,7 +644,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                        switch (e)
                        {
                                case WSAECONNREFUSED:
-                                       Con_Printf("Connection refused\n");
+                                       Con_Print("Connection refused\n");
                                        return 0;
                        }
 #else
@@ -644,7 +653,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                        switch (errno)
                        {
                                case ECONNREFUSED:
-                                       Con_Printf("Connection refused\n");
+                                       Con_Print("Connection refused\n");
                                        return 0;
                        }
 #endif
@@ -675,8 +684,7 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
                p->next->prev = p;
                p->prev->next = p;
 #ifndef STANDALONETEST
-               if (cl_fakelocalping_min.integer || cl_fakelocalping_max.integer)
-                       p->sentdoubletime = Sys_DoubleTime() + (cl_fakelocalping_min.integer + ((cl_fakelocalping_max.integer - cl_fakelocalping_min.integer) * (rand() & 255) / 256)) / 1000.0;
+               p->sentdoubletime = Sys_DoubleTime();
 #endif
                value = contentlength;
        }