]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - lhnet.c
Fix setinfo.
[xonotic/darkplaces.git] / lhnet.c
diff --git a/lhnet.c b/lhnet.c
index fd668b7ee6d83ac59c55bdb8d4f3e1838dd5de60..3ac17a0aad880a6b4d912345ca7626d3e1ee268f 100644 (file)
--- a/lhnet.c
+++ b/lhnet.c
@@ -1,6 +1,21 @@
 
 // Written by Forest Hale 2003-06-15 and placed into public domain.
 
+#ifdef WIN32
+#ifdef _MSC_VER
+#pragma comment(lib, "ws2_32.lib")
+#endif
+# ifndef NOSUPPORTIPV6
+// Windows XP or higher is required for getaddrinfo, but the inclusion of wspiapi provides fallbacks for older versions
+# define _WIN32_WINNT 0x0501
+# endif
+# include <winsock2.h>
+# include <ws2tcpip.h>
+# ifdef USE_WSPIAPI_H
+#  include <wspiapi.h>
+# endif
+#endif
+
 #ifndef STANDALONETEST
 #include "quakedef.h"
 #endif
@@ -9,12 +24,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
-#ifdef WIN32
-#define _WIN32_WINNT 0x0501
-       // Windows XP or higher is required for getaddrinfo
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
+#ifndef WIN32
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifndef NOSUPPORTIPV6
 #include <net/if.h>
 #endif
+#endif
 
 #ifdef __MORPHOS__
 #include <proto/socket.h>
@@ -45,6 +57,9 @@
 #include "lhnet.h"
 
 #if defined(WIN32)
+// as of Visual Studio 2015, EWOULDBLOCK and ECONNREFUSED are real things, with different values than we want when talking to WinSock, so we have to undef them here or change the rest of the code.
+#undef EWOULDBLOCK
+#undef ECONNREFUSED
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #define ECONNREFUSED WSAECONNREFUSED
 
 #define SOCKLEN_T socklen_t
 #endif
 
+#ifdef MSG_DONTWAIT
+#define LHNET_RECVFROM_FLAGS MSG_DONTWAIT
+#define LHNET_SENDTO_FLAGS 0
+#else
+#define LHNET_RECVFROM_FLAGS 0
+#define LHNET_SENDTO_FLAGS 0
+#endif
+
 typedef struct lhnetaddressnative_s
 {
        lhnetaddresstype_t addresstype;
@@ -77,7 +100,9 @@ typedef struct lhnetaddressnative_s
        {
                struct sockaddr sock;
                struct sockaddr_in in;
+#ifndef NOSUPPORTIPV6
                struct sockaddr_in6 in6;
+#endif
        }
        addr;
 }
@@ -102,7 +127,7 @@ int LHNETADDRESS_FromPort(lhnetaddress_t *vaddress, lhnetaddresstype_t addressty
        switch(addresstype)
        {
        default:
-               return 0;
+               break;
        case LHNETADDRESSTYPE_LOOP:
                // local:port  (loopback)
                memset(address, 0, sizeof(*address));
@@ -117,6 +142,7 @@ int LHNETADDRESS_FromPort(lhnetaddress_t *vaddress, lhnetaddresstype_t addressty
                address->addr.in.sin_family = AF_INET;
                address->addr.in.sin_port = htons((unsigned short)port);
                return 1;
+#ifndef NOSUPPORTIPV6
        case LHNETADDRESSTYPE_INET6:
                // [0:0:0:0:0:0:0:0]:port  (IN6ADDR_ANY, binds to all interfaces)
                memset(address, 0, sizeof(*address));
@@ -125,11 +151,13 @@ int LHNETADDRESS_FromPort(lhnetaddress_t *vaddress, lhnetaddresstype_t addressty
                address->addr.in6.sin6_family = AF_INET6;
                address->addr.in6.sin6_port = htons((unsigned short)port);
                return 1;
+#endif
        }
        return 0;
 }
 
-int LHNETADDRESS_Resolve(lhnetaddressnative_t *address, const char *name, int port)
+#ifndef NOSUPPORTIPV6
+static int LHNETADDRESS_Resolve(lhnetaddressnative_t *address, const char *name, int port)
 {
        char port_buff [16];
        struct addrinfo hints;
@@ -148,7 +176,10 @@ int LHNETADDRESS_Resolve(lhnetaddressnative_t *address, const char *name, int po
        if (err != 0 || addrinf == NULL)
                return 0;
        if (addrinf->ai_addr->sa_family != AF_INET6 && addrinf->ai_addr->sa_family != AF_INET)
+       {
+               freeaddrinfo (addrinf);
                return 0;
+       }
 
        // great it worked
        if (addrinf->ai_addr->sa_family == AF_INET6)
@@ -343,14 +374,173 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de
        namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
        return resolved;
 }
+#else
+int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int defaultport)
+{
+       lhnetaddressnative_t *address = (lhnetaddressnative_t *)vaddress;
+       int i, port, namelen, d1, d2, d3, d4;
+       struct hostent *hostentry;
+       unsigned char *a;
+       const char *colon;
+       char name[128];
+#ifdef STANDALONETEST
+       char string2[128];
+#endif
+       if (!address || !string || !*string)
+               return 0;
+       memset(address, 0, sizeof(*address));
+       address->addresstype = LHNETADDRESSTYPE_NONE;
+       port = 0;
+       colon = strrchr(string, ':');
+       if (colon && (colon == strchr(string, ':') || (string[0] == '[' && colon - string > 0 && colon[-1] == ']')))
+       //           EITHER: colon is the ONLY colon  OR: colon comes after [...] delimited IPv6 address
+       //           fixes misparsing of IPv6 addresses without port
+       {
+               port = atoi(colon + 1);
+       }
+       else
+               colon = string + strlen(string);
+       if (port == 0)
+               port = defaultport;
+       namelen = colon - string;
+       if (namelen > 127)
+               namelen = 127;
+       if (string[0] == '[' && namelen > 0 && string[namelen-1] == ']') // ipv6
+       {
+               string++;
+               namelen -= 2;
+       }
+       memcpy(name, string, namelen);
+       name[namelen] = 0;
+       // handle loopback
+       if (!strcmp(name, "local"))
+       {
+               address->addresstype = LHNETADDRESSTYPE_LOOP;
+               address->port = port;
+               return 1;
+       }
+       // try to parse as dotted decimal ipv4 address first
+       // note this supports partial ip addresses
+       d1 = d2 = d3 = d4 = 0;
+#if _MSC_VER >= 1400
+#define sscanf sscanf_s
+#endif
+       if (sscanf(name, "%d.%d.%d.%d", &d1, &d2, &d3, &d4) >= 1 && (unsigned int)d1 < 256 && (unsigned int)d2 < 256 && (unsigned int)d3 < 256 && (unsigned int)d4 < 256)
+       {
+               // parsed a valid ipv4 address
+               address->addresstype = LHNETADDRESSTYPE_INET4;
+               address->port = port;
+               address->addr.in.sin_family = AF_INET;
+               address->addr.in.sin_port = htons((unsigned short)port);
+               a = (unsigned char *)&address->addr.in.sin_addr;
+               a[0] = d1;
+               a[1] = d2;
+               a[2] = d3;
+               a[3] = d4;
+#ifdef STANDALONETEST
+               LHNETADDRESS_ToString(address, string2, sizeof(string2), 1);
+               printf("manual parsing of ipv4 dotted decimal address \"%s\" successful: %s\n", string, string2);
+#endif
+               return 1;
+       }
+       for (i = 0;i < MAX_NAMECACHE;i++)
+               if (!strcmp(namecache[i].name, name))
+                       break;
+#ifdef STANDALONETEST
+       if (i < MAX_NAMECACHE)
+#else
+       if (i < MAX_NAMECACHE && realtime < namecache[i].expirationtime)
+#endif
+       {
+               *address = namecache[i].address;
+               address->port = port;
+               if (address->addresstype == LHNETADDRESSTYPE_INET6)
+               {
+#ifndef NOSUPPORTIPV6
+                       address->addr.in6.sin6_port = htons((unsigned short)port);
+                       return 1;
+#endif
+               }
+               else if (address->addresstype == LHNETADDRESSTYPE_INET4)
+               {
+                       address->addr.in.sin_port = htons((unsigned short)port);
+                       return 1;
+               }
+               return 0;
+       }
+       // try gethostbyname (handles dns and other ip formats)
+       hostentry = gethostbyname(name);
+       if (hostentry)
+       {
+               if (hostentry->h_addrtype == AF_INET6)
+               {
+#ifndef NOSUPPORTIPV6
+                       // great it worked
+                       address->addresstype = LHNETADDRESSTYPE_INET6;
+                       address->port = port;
+                       address->addr.in6.sin6_family = hostentry->h_addrtype;
+                       address->addr.in6.sin6_port = htons((unsigned short)port);
+                       memcpy(&address->addr.in6.sin6_addr, hostentry->h_addr_list[0], sizeof(address->addr.in6.sin6_addr));
+                       for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+                               namecache[namecacheposition].name[i] = name[i];
+                       namecache[namecacheposition].name[i] = 0;
+#ifndef STANDALONETEST
+                       namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours
+#endif
+                       namecache[namecacheposition].address = *address;
+                       namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
+#ifdef STANDALONETEST
+                       LHNETADDRESS_ToString(address, string2, sizeof(string2), 1);
+                       printf("gethostbyname(\"%s\") returned ipv6 address %s\n", string, string2);
+#endif
+                       return 1;
+#endif
+               }
+               else if (hostentry->h_addrtype == AF_INET)
+               {
+                       // great it worked
+                       address->addresstype = LHNETADDRESSTYPE_INET4;
+                       address->port = port;
+                       address->addr.in.sin_family = hostentry->h_addrtype;
+                       address->addr.in.sin_port = htons((unsigned short)port);
+                       memcpy(&address->addr.in.sin_addr, hostentry->h_addr_list[0], sizeof(address->addr.in.sin_addr));
+                       for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+                               namecache[namecacheposition].name[i] = name[i];
+                       namecache[namecacheposition].name[i] = 0;
+#ifndef STANDALONETEST
+                       namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours
+#endif
+                       namecache[namecacheposition].address = *address;
+                       namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
+#ifdef STANDALONETEST
+                       LHNETADDRESS_ToString(address, string2, sizeof(string2), 1);
+                       printf("gethostbyname(\"%s\") returned ipv4 address %s\n", string, string2);
+#endif
+                       return 1;
+               }
+       }
+#ifdef STANDALONETEST
+       printf("gethostbyname failed on address \"%s\"\n", name);
+#endif
+       for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+               namecache[namecacheposition].name[i] = name[i];
+       namecache[namecacheposition].name[i] = 0;
+#ifndef STANDALONETEST
+       namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours
+#endif
+       namecache[namecacheposition].address.addresstype = LHNETADDRESSTYPE_NONE;
+       namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
+       return 0;
+}
+#endif
 
 int LHNETADDRESS_ToString(const lhnetaddress_t *vaddress, char *string, int stringbuffersize, int includeport)
 {
        lhnetaddressnative_t *address = (lhnetaddressnative_t *)vaddress;
        const unsigned char *a;
-       *string = 0;
        if (!address || !string || stringbuffersize < 1)
                return 0;
+       *string = 0;
        switch(address->addresstype)
        {
        default:
@@ -392,6 +582,7 @@ int LHNETADDRESS_ToString(const lhnetaddress_t *vaddress, char *string, int stri
                        }
                }
                break;
+#ifndef NOSUPPORTIPV6
        case LHNETADDRESSTYPE_INET6:
                a = (const unsigned char *)(&address->addr.in6.sin6_addr);
                if (includeport)
@@ -411,6 +602,7 @@ int LHNETADDRESS_ToString(const lhnetaddress_t *vaddress, char *string, int stri
                        }
                }
                break;
+#endif
        }
        return 0;
 }
@@ -423,16 +615,15 @@ int LHNETADDRESS_GetAddressType(const lhnetaddress_t *address)
                return LHNETADDRESSTYPE_NONE;
 }
 
-const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress)
+const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress, char *ifname, size_t ifnamelength)
 {
+#ifndef NOSUPPORTIPV6
        lhnetaddressnative_t *address = (lhnetaddressnative_t *)vaddress;
 
        if (address && address->addresstype == LHNETADDRESSTYPE_INET6)
        {
 #ifndef _WIN32
 
-               static char ifname [IF_NAMESIZE];
-               
                if (if_indextoname(address->addr.in6.sin6_scope_id, ifname) == ifname)
                        return ifname;
 
@@ -441,13 +632,12 @@ const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress)
                // The Win32 API doesn't have if_indextoname() until Windows Vista,
                // but luckily it just uses the interface ID as the interface name
 
-               static char ifname [16];
-
-               if (dpsnprintf(ifname, sizeof(ifname), "%lu", address->addr.in6.sin6_scope_id) > 0)
+               if (dpsnprintf(ifname, ifnamelength, "%lu", address->addr.in6.sin6_scope_id) > 0)
                        return ifname;
 
 #endif
        }
+#endif
 
        return NULL;
 }
@@ -472,9 +662,11 @@ int LHNETADDRESS_SetPort(lhnetaddress_t *vaddress, int port)
        case LHNETADDRESSTYPE_INET4:
                address->addr.in.sin_port = htons((unsigned short)port);
                return 1;
+#ifndef NOSUPPORTIPV6
        case LHNETADDRESSTYPE_INET6:
                address->addr.in6.sin6_port = htons((unsigned short)port);
                return 1;
+#endif
        default:
                return 0;
        }
@@ -502,6 +694,7 @@ int LHNETADDRESS_Compare(const lhnetaddress_t *vaddress1, const lhnetaddress_t *
                if (address1->port != address2->port)
                        return -1;
                return 0;
+#ifndef NOSUPPORTIPV6
        case LHNETADDRESSTYPE_INET6:
                if (address1->addr.in6.sin6_family != address2->addr.in6.sin6_family)
                        return 1;
@@ -510,6 +703,7 @@ int LHNETADDRESS_Compare(const lhnetaddress_t *vaddress1, const lhnetaddress_t *
                if (address1->port != address2->port)
                        return -1;
                return 0;
+#endif
        default:
                return 1;
        }
@@ -532,6 +726,7 @@ lhnetpacket_t;
 static int lhnet_active;
 static lhnetsocket_t lhnet_socketlist;
 static lhnetpacket_t lhnet_packetlist;
+static int lhnet_default_dscp = 0;
 #ifdef WIN32
 static int lhnet_didWSAStartup = 0;
 static WSADATA lhnet_winsockdata;
@@ -551,6 +746,18 @@ void LHNET_Init(void)
 #endif
 }
 
+int LHNET_DefaultDSCP(int dscp)
+{
+#ifdef IP_TOS
+       int prev = lhnet_default_dscp;
+       if(dscp >= 0)
+               lhnet_default_dscp = dscp;
+       return prev;
+#else
+       return -1;
+#endif
+}
+
 void LHNET_Shutdown(void)
 {
        lhnetpacket_t *p;
@@ -635,6 +842,7 @@ static const char *LHNETPRIVATE_StrError(void)
 
 void LHNET_SleepUntilPacket_Microseconds(int microseconds)
 {
+#ifdef FD_SET
        fd_set fdreadset;
        struct timeval tv;
        int lastfd;
@@ -647,12 +855,19 @@ void LHNET_SleepUntilPacket_Microseconds(int microseconds)
                {
                        if (lastfd < s->inetsocket)
                                lastfd = s->inetsocket;
+#if defined(WIN32) && !defined(_MSC_VER)
+                       FD_SET((int)s->inetsocket, &fdreadset);
+#else
                        FD_SET((unsigned int)s->inetsocket, &fdreadset);
+#endif
                }
        }
        tv.tv_sec = microseconds / 1000000;
        tv.tv_usec = microseconds % 1000000;
        select(lastfd + 1, &fdreadset, NULL, NULL, &tv);
+#else
+       Sys_Sleep(microseconds);
+#endif
 }
 
 lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
@@ -700,20 +915,32 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
                        }
                        break;
                case LHNETADDRESSTYPE_INET4:
+#ifndef NOSUPPORTIPV6
                case LHNETADDRESSTYPE_INET6:
+#endif
 #ifdef WIN32
                        if (lhnet_didWSAStartup)
                        {
 #endif
+#ifndef NOSUPPORTIPV6
                                if ((lhnetsocket->inetsocket = socket(address->addresstype == LHNETADDRESSTYPE_INET6 ? PF_INET6 : PF_INET, SOCK_DGRAM, IPPROTO_UDP)) != -1)
+#else
+                               if ((lhnetsocket->inetsocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) != -1)
+#endif
                                {
 #ifdef WIN32
-                                       u_long _true = 1;
                                        u_long _false = 0;
+#endif
+#ifdef MSG_DONTWAIT
+                                       if (1)
+#else
+#ifdef WIN32
+                                       u_long _true = 1;
 #else
                                        char _true = 1;
 #endif
                                        if (ioctlsocket(lhnetsocket->inetsocket, FIONBIO, &_true) != -1)
+#endif
                                        {
 #ifdef IPV6_V6ONLY
                                                // We need to set this flag to tell the OS that we only listen on IPv6. If we don't
@@ -722,7 +949,7 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
                                                int ipv6_only = 1;
                                                if (address->addresstype != LHNETADDRESSTYPE_INET6
                                                        || setsockopt (lhnetsocket->inetsocket, IPPROTO_IPV6, IPV6_V6ONLY,
-                                                                                  (const void *)&ipv6_only, sizeof(ipv6_only)) == 0
+                                                                                  (const char *)&ipv6_only, sizeof(ipv6_only)) == 0
 #ifdef WIN32
                                                        // The Win32 API only supports IPV6_V6ONLY since Windows Vista, but fortunately
                                                        // the default value is what we want on Win32 anyway (IPV6_V6ONLY = true)
@@ -734,25 +961,63 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
                                                        lhnetaddressnative_t *localaddress = (lhnetaddressnative_t *)&lhnetsocket->address;
                                                        SOCKLEN_T namelen;
                                                        int bindresult;
+
+#if defined(SOL_RFC1149) && defined(RFC1149_1149ONLY)
+                                                       // we got reports of massive lags when this protocol was chosen as transport
+                                                       // so better turn it off
+                                                       {
+                                                               int rfc1149only = 0;
+                                                               int rfc1149enabled = 0;
+                                                               if(setsockopt(lhnetsocket->inetsocket, SOL_RFC1149, RFC1149_1149ONLY, &rfc1149only))
+                                                                       Con_Printf("LHNET_OpenSocket_Connectionless: warning: setsockopt(RFC1149_1149ONLY) returned error: %s\n", LHNETPRIVATE_StrError());
+                                                               if(setsockopt(lhnetsocket->inetsocket, SOL_RFC1149, RFC1149_ENABLED, &rfc1149enabled))
+                                                                       Con_Printf("LHNET_OpenSocket_Connectionless: warning: setsockopt(RFC1149_ENABLED) returned error: %s\n", LHNETPRIVATE_StrError());
+                                                       }
+#endif
+
+#ifndef NOSUPPORTIPV6
                                                        if (address->addresstype == LHNETADDRESSTYPE_INET6)
                                                        {
                                                                namelen = sizeof(localaddress->addr.in6);
                                                                bindresult = bind(lhnetsocket->inetsocket, &localaddress->addr.sock, namelen);
                                                                if (bindresult != -1)
-                                                                       getsockname(lhnetsocket->inetsocket, &localaddress->addr.sock, &namelen);
+                                                               {
+                                                                       if (getsockname(lhnetsocket->inetsocket, &localaddress->addr.sock, &namelen))
+                                                                       {
+                                                                               // If getsockname failed, we can assume the bound socket is useless.
+                                                                               bindresult = -1;
+                                                                       }
+                                                               }
                                                        }
                                                        else
+#endif
                                                        {
                                                                namelen = sizeof(localaddress->addr.in);
                                                                bindresult = bind(lhnetsocket->inetsocket, &localaddress->addr.sock, namelen);
                                                                if (bindresult != -1)
-                                                                       getsockname(lhnetsocket->inetsocket, &localaddress->addr.sock, &namelen);
+                                                               {
+                                                                       if (getsockname(lhnetsocket->inetsocket, &localaddress->addr.sock, &namelen))
+                                                                       {
+                                                                               // If getsockname failed, we can assume the bound socket is useless.
+                                                                               bindresult = -1;
+                                                                       }
+                                                               }
                                                        }
                                                        if (bindresult != -1)
                                                        {
                                                                int i = 1;
                                                                // enable broadcast on this socket
                                                                setsockopt(lhnetsocket->inetsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i));
+#ifdef IP_TOS
+                                                               {
+                                                                       // enable DSCP for ToS support
+                                                                       int tos = lhnet_default_dscp << 2;
+                                                                       if (setsockopt(lhnetsocket->inetsocket, IPPROTO_IP, IP_TOS, (char *) &tos, sizeof(tos)))
+                                                                       {
+                                                                               // Error in setsockopt - fine, we'll simply set no TOS then.
+                                                                       }
+                                                               }
+#endif
                                                                lhnetsocket->next = &lhnet_socketlist;
                                                                lhnetsocket->prev = lhnetsocket->next->prev;
                                                                lhnetsocket->next->prev = lhnetsocket;
@@ -869,17 +1134,17 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
        }
        else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET4)
        {
-               unsigned int inetaddresslength;
+               SOCKLEN_T inetaddresslength;
                address->addresstype = LHNETADDRESSTYPE_NONE;
                inetaddresslength = sizeof(address->addr.in);
-               value = recvfrom(lhnetsocket->inetsocket, content, maxcontentlength, 0, &address->addr.sock, &inetaddresslength);
+               value = recvfrom(lhnetsocket->inetsocket, (char *)content, maxcontentlength, LHNET_RECVFROM_FLAGS, &address->addr.sock, &inetaddresslength);
                if (value > 0)
                {
                        address->addresstype = LHNETADDRESSTYPE_INET4;
                        address->port = ntohs(address->addr.in.sin_port);
                        return value;
                }
-               else if (value == -1)
+               else if (value < 0)
                {
                        int e = SOCKETERRNO;
                        if (e == EWOULDBLOCK)
@@ -890,15 +1155,16 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                                        Con_Print("Connection refused\n");
                                        return 0;
                        }
-                       Con_Printf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
+                       Con_DPrintf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
                }
        }
+#ifndef NOSUPPORTIPV6
        else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
        {
-               unsigned int inetaddresslength;
+               SOCKLEN_T inetaddresslength;
                address->addresstype = LHNETADDRESSTYPE_NONE;
                inetaddresslength = sizeof(address->addr.in6);
-               value = recvfrom(lhnetsocket->inetsocket, content, maxcontentlength, 0, &address->addr.sock, &inetaddresslength);
+               value = recvfrom(lhnetsocket->inetsocket, (char *)content, maxcontentlength, LHNET_RECVFROM_FLAGS, &address->addr.sock, &inetaddresslength);
                if (value > 0)
                {
                        address->addresstype = LHNETADDRESSTYPE_INET6;
@@ -916,9 +1182,10 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                                        Con_Print("Connection refused\n");
                                        return 0;
                        }
-                       Con_Printf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
+                       Con_DPrintf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
                }
        }
+#endif
        return value;
 }
 
@@ -951,24 +1218,26 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
        }
        else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET4)
        {
-               value = sendto(lhnetsocket->inetsocket, content, contentlength, 0, (struct sockaddr *)&address->addr.in, sizeof(struct sockaddr_in));
+               value = sendto(lhnetsocket->inetsocket, (char *)content, contentlength, LHNET_SENDTO_FLAGS, (struct sockaddr *)&address->addr.in, sizeof(struct sockaddr_in));
                if (value == -1)
                {
                        if (SOCKETERRNO == EWOULDBLOCK)
                                return 0;
-                       Con_Printf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
+                       Con_DPrintf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
                }
        }
+#ifndef NOSUPPORTIPV6
        else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
        {
-               value = sendto(lhnetsocket->inetsocket, content, contentlength, 0, (struct sockaddr *)&address->addr.in6, sizeof(struct sockaddr_in6));
+               value = sendto(lhnetsocket->inetsocket, (char *)content, contentlength, 0, (struct sockaddr *)&address->addr.in6, sizeof(struct sockaddr_in6));
                if (value == -1)
                {
                        if (SOCKETERRNO == EWOULDBLOCK)
                                return 0;
-                       Con_Printf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
+                       Con_DPrintf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
                }
        }
+#endif
        return value;
 }