Add _DrawQ_ProcessDrawFlag to clean-up the glblend setup code.

[xonotic/darkplaces.git] / lhnet.c

diff --git a/lhnet.c b/lhnet.c
index 91805d6f130f1415759eae4b7d5f8ca587e51afe..bbab448016a81956574319ac063294575ed755c3 100644 (file)
--- a/lhnet.c
+++ b/lhnet.c
@@ -17,6 +17,10 @@
 #include <arpa/inet.h>
 #endif
 
+#ifdef __MORPHOS__
+#include <proto/socket.h>
+#endif
+
 // for Z_Malloc/Z_Free in quake
 #ifndef STANDALONETEST
 #include "quakedef.h"
@@ -32,11 +36,33 @@
 
 #include "lhnet.h"
 
+#if defined(WIN32)
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define ECONNREFUSED WSAECONNREFUSED
+
+#define SOCKETERRNO WSAGetLastError()
+
+#define SOCKLEN_T int
+#elif defined(__MORPHOS__)
+#define ioctlsocket IoctlSocket
+#define closesocket CloseSocket
+#define SOCKETERRNO Errno()
+
+#define SOCKLEN_T int
+#else
+#define ioctlsocket ioctl
+#define closesocket close
+#define SOCKETERRNO errno
+
+#define SOCKLEN_T socklen_t
+#endif
+
 // to make LHNETADDRESS_FromString resolve repeated hostnames faster, cache them
 #define MAX_NAMECACHE 64
 static struct namecache_s
 {
        lhnetaddress_t address;
+       double expirationtime;
        char name[64];
 }
 namecache[MAX_NAMECACHE];
@@ -126,7 +152,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
        for (i = 0;i < MAX_NAMECACHE;i++)
                if (!strcmp(namecache[i].name, name))
                        break;
-       if (i < MAX_NAMECACHE)
+       if (i < MAX_NAMECACHE && Sys_DoubleTime() < namecache[i].expirationtime)
        {
                *address = namecache[i].address;
                if (address->addresstype == LHNETADDRESSTYPE_INET6)
@@ -152,9 +178,10 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
                        address->addressdata.inet6.family = hostentry->h_addrtype;
                        address->addressdata.inet6.port = htons((unsigned short)port);
                        memcpy(address->addressdata.inet6.address, hostentry->h_addr_list[0], sizeof(address->addressdata.inet6.address));
-                       for (i = 0;i < sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+                       for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
                                namecache[namecacheposition].name[i] = name[i];
                        namecache[namecacheposition].name[i] = 0;
+                       namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
                        namecache[namecacheposition].address = *address;
                        namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
 #ifdef STANDALONETEST
@@ -169,9 +196,10 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
                        address->addressdata.inet4.family = hostentry->h_addrtype;
                        address->addressdata.inet4.port = htons((unsigned short)port);
                        memcpy(address->addressdata.inet4.address, hostentry->h_addr_list[0], sizeof(address->addressdata.inet4.address));
-                       for (i = 0;i < sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+                       for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
                                namecache[namecacheposition].name[i] = name[i];
                        namecache[namecacheposition].name[i] = 0;
+                       namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
                        namecache[namecacheposition].address = *address;
                        namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
 #ifdef STANDALONETEST
@@ -183,9 +211,10 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
 #ifdef STANDALONETEST
        printf("gethostbyname failed on address \"%s\"\n", name);
 #endif
-       for (i = 0;i < sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+       for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
                namecache[namecacheposition].name[i] = name[i];
        namecache[namecacheposition].name[i] = 0;
+       namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
        namecache[namecacheposition].address.addresstype = LHNETADDRESSTYPE_NONE;
        namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
        return 0;
@@ -447,7 +476,7 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
        lhnetsocket_t *lhnetsocket, *s;
        if (!address)
                return NULL;
-       lhnetsocket = Z_Malloc(sizeof(*lhnetsocket));
+       lhnetsocket = (lhnetsocket_t *)Z_Malloc(sizeof(*lhnetsocket));
        if (lhnetsocket)
        {
                memset(lhnetsocket, 0, sizeof(*lhnetsocket));
@@ -496,22 +525,17 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
                                {
 #ifdef WIN32
                                        u_long _true = 1;
-                                       if (ioctlsocket(lhnetsocket->inetsocket, FIONBIO, &_true) != -1)
 #else
                                        char _true = 1;
-                                       if (ioctl(lhnetsocket->inetsocket, FIONBIO, &_true) != -1)
 #endif
+                                       if (ioctlsocket(lhnetsocket->inetsocket, FIONBIO, &_true) != -1)
                                        {
-#ifdef WIN32
-                                               int namelen;
-#else
-                                               socklen_t namelen;
-#endif
+                                               SOCKLEN_T namelen;
                                                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)
+                                               if (bind(lhnetsocket->inetsocket, (struct sockaddr *)&lhnetsocket->address.addressdata, namelen) != -1)
                                                {
                                                        int i = 1;
-                                                       getsockname(lhnetsocket->inetsocket, (void *)&lhnetsocket->address.addressdata, &namelen);
+                                                       getsockname(lhnetsocket->inetsocket, (struct sockaddr *)&lhnetsocket->address.addressdata, &namelen);
                                                        // enable broadcast on this socket
                                                        setsockopt(lhnetsocket->inetsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i));
                                                        lhnetsocket->next = &lhnet_socketlist;
@@ -525,11 +549,7 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
                                        }
                                        else
                                                Con_Printf("LHNET_OpenSocket_Connectionless: ioctlsocket returned error: %s\n", LHNETPRIVATE_StrError());
-#ifdef WIN32
                                        closesocket(lhnetsocket->inetsocket);
-#else
-                                       close(lhnetsocket->inetsocket);
-#endif
                                }
                                else
                                        Con_Printf("LHNET_OpenSocket_Connectionless: socket returned error: %s\n", LHNETPRIVATE_StrError());
@@ -562,11 +582,7 @@ void LHNET_CloseSocket(lhnetsocket_t *lhnetsocket)
                // no special close code for loopback, just inet
                if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET4 || lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
                {
-#ifdef WIN32
                        closesocket(lhnetsocket->inetsocket);
-#else
-                       close(lhnetsocket->inetsocket);
-#endif
                }
 #ifdef WIN32
                if (lhnet_socketlist.next == &lhnet_socketlist && lhnet_didWSAStartup)
@@ -634,7 +650,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
        }
        else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET4)
        {
-               int inetaddresslength;
+               unsigned int inetaddresslength;
                address->addresstype = LHNETADDRESSTYPE_NONE;
                inetaddresslength = sizeof(address->addressdata.inet4);
                value = recvfrom(lhnetsocket->inetsocket, content, maxcontentlength, 0, (struct sockaddr *)&address->addressdata.inet4, &inetaddresslength);
@@ -645,31 +661,20 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                }
                else if (value == -1)
                {
-#ifdef WIN32
-                       int e = WSAGetLastError();
-                       if (e == WSAEWOULDBLOCK)
+                       int e = SOCKETERRNO;
+                       if (e == EWOULDBLOCK)
                                return 0;
                        switch (e)
-                       {
-                               case WSAECONNREFUSED:
-                                       Con_Print("Connection refused\n");
-                                       return 0;
-                       }
-#else
-                       if (errno == EWOULDBLOCK)
-                               return 0;
-                       switch (errno)
                        {
                                case ECONNREFUSED:
                                        Con_Print("Connection refused\n");
                                        return 0;
                        }
-#endif
                }
        }
        else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
        {
-               int inetaddresslength;
+               unsigned int inetaddresslength;
                address->addresstype = LHNETADDRESSTYPE_NONE;
                inetaddresslength = sizeof(address->addressdata.inet6);
                value = recvfrom(lhnetsocket->inetsocket, content, maxcontentlength, 0, (struct sockaddr *)&address->addressdata.inet6, &inetaddresslength);
@@ -680,26 +685,15 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                }
                else if (value == -1)
                {
-#ifdef WIN32
-                       int e = WSAGetLastError();
-                       if (e == WSAEWOULDBLOCK)
+                       int e = SOCKETERRNO;
+                       if (e == EWOULDBLOCK)
                                return 0;
                        switch (e)
-                       {
-                               case WSAECONNREFUSED:
-                                       Con_Print("Connection refused\n");
-                                       return 0;
-                       }
-#else
-                       if (errno == EWOULDBLOCK)
-                               return 0;
-                       switch (errno)
                        {
                                case ECONNREFUSED:
                                        Con_Print("Connection refused\n");
                                        return 0;
                        }
-#endif
                }
        }
        return value;
@@ -715,7 +709,7 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
        if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_LOOP)
        {
                lhnetpacket_t *p;
-               p = Z_Malloc(sizeof(*p) + contentlength);
+               p = (lhnetpacket_t *)Z_Malloc(sizeof(*p) + contentlength);
                p->data = (void *)(p + 1);
                memcpy(p->data, content, contentlength);
                p->length = contentlength;
@@ -736,14 +730,8 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
                value = sendto(lhnetsocket->inetsocket, content, contentlength, 0, (struct sockaddr *)&address->addressdata.inet4, sizeof(address->addressdata.inet4));
                if (value == -1)
                {
-#ifdef WIN32
-                       int e = WSAGetLastError();
-                       if (e == WSAEWOULDBLOCK)
-                               return 0;
-#else
-                       if (errno == EWOULDBLOCK)
+                       if (SOCKETERRNO == EWOULDBLOCK)
                                return 0;
-#endif
                }
        }
        else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
@@ -751,14 +739,8 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
                value = sendto(lhnetsocket->inetsocket, content, contentlength, 0, (struct sockaddr *)&address->addressdata.inet6, sizeof(address->addressdata.inet6));
                if (value == -1)
                {
-#ifdef WIN32
-                       int e = WSAGetLastError();
-                       if (e == WSAEWOULDBLOCK)
+                       if (SOCKETERRNO == EWOULDBLOCK)
                                return 0;
-#else
-                       if (errno == EWOULDBLOCK)
-                               return 0;
-#endif
                }
        }
        return value;