]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - lhnet.c
unset command
[xonotic/darkplaces.git] / lhnet.c
diff --git a/lhnet.c b/lhnet.c
index 37d9c6202049321e6f7feb3f85f4f7e7ce8efef2..99b9f144f941d9a3c1459c0ac781e1130c901773 100644 (file)
--- a/lhnet.c
+++ b/lhnet.c
@@ -1,6 +1,18 @@
 
 // Written by Forest Hale 2003-06-15 and placed into public domain.
 
+#ifdef WIN32
+# ifdef SUPPORTIPV6
+// 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,10 +21,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
-#ifdef WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
+#ifndef WIN32
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -21,6 +30,9 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifdef SUPPORTIPV6
+#include <net/if.h>
+#endif
 #endif
 
 #ifdef __MORPHOS__
 #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;
@@ -74,7 +94,9 @@ typedef struct lhnetaddressnative_s
        {
                struct sockaddr sock;
                struct sockaddr_in in;
+#ifdef SUPPORTIPV6
                struct sockaddr_in6 in6;
+#endif
        }
        addr;
 }
@@ -99,7 +121,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));
@@ -114,6 +136,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;
+#ifdef SUPPORTIPV6
        case LHNETADDRESSTYPE_INET6:
                // [0:0:0:0:0:0:0:0]:port  (IN6ADDR_ANY, binds to all interfaces)
                memset(address, 0, sizeof(*address));
@@ -122,10 +145,230 @@ 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;
 }
 
+#ifdef SUPPORTIPV6
+int LHNETADDRESS_Resolve(lhnetaddressnative_t *address, const char *name, int port)
+{
+       char port_buff [16];
+       struct addrinfo hints;
+       struct addrinfo* addrinf;
+       int err;
+
+       dpsnprintf (port_buff, sizeof (port_buff), "%d", port);
+       port_buff[sizeof (port_buff) - 1] = '\0';
+
+       memset(&hints, 0, sizeof (hints));
+       hints.ai_family = AF_UNSPEC;
+       hints.ai_socktype = SOCK_DGRAM;
+       //hints.ai_flags = AI_PASSIVE;
+
+       err = getaddrinfo(name, port_buff, &hints, &addrinf);
+       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)
+       {
+               address->addresstype = LHNETADDRESSTYPE_INET6;
+               memcpy(&address->addr.in6, addrinf->ai_addr, sizeof(address->addr.in6));
+       }
+       else
+       {
+               address->addresstype = LHNETADDRESSTYPE_INET4;
+               memcpy(&address->addr.in, addrinf->ai_addr, sizeof(address->addr.in));
+       }
+       address->port = port;
+       
+       freeaddrinfo (addrinf);
+       return 1;
+}
+
+int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int defaultport)
+{
+       lhnetaddressnative_t *address = (lhnetaddressnative_t *)vaddress;
+       int i, port, d1, d2, d3, d4, resolved;
+       size_t namelen;
+       unsigned char *a;
+       char name[128];
+#ifdef STANDALONETEST
+       char string2[128];
+#endif
+       const char* addr_start;
+       const char* addr_end = NULL;
+       const char* port_name = NULL;
+       int addr_family = AF_UNSPEC;
+
+       if (!address || !string || !*string)
+               return 0;
+       memset(address, 0, sizeof(*address));
+       address->addresstype = LHNETADDRESSTYPE_NONE;
+       port = 0;
+
+       // If it's a bracketed IPv6 address
+       if (string[0] == '[')
+       {
+               const char* end_bracket = strchr(string, ']');
+
+               if (end_bracket == NULL)
+                       return 0;
+
+               if (end_bracket[1] == ':')
+                       port_name = end_bracket + 2;
+               else if (end_bracket[1] != '\0')
+                       return 0;
+
+               addr_family = AF_INET6;
+               addr_start = &string[1];
+               addr_end = end_bracket;
+       }
+       else
+       {
+               const char* first_colon;
+
+               addr_start = string;
+
+               // If it's a numeric non-bracket IPv6 address (-> no port),
+               // or it's a numeric IPv4 address, or a name, with a port
+               first_colon = strchr(string, ':');
+               if (first_colon != NULL)
+               {
+                       const char* last_colon = strrchr(first_colon + 1, ':');
+
+                       // If it's an numeric IPv4 address, or a name, with a port
+                       if (last_colon == NULL)
+                       {
+                               addr_end = first_colon;
+                               port_name = first_colon + 1;
+                       }
+                       else
+                               addr_family = AF_INET6;
+               }
+       }
+
+       if (addr_end != NULL)
+               namelen = addr_end - addr_start;
+       else
+               namelen = strlen (addr_start);
+
+       if (namelen >= sizeof(name))
+               namelen = sizeof(name) - 1;
+       memcpy (name, addr_start, namelen);
+       name[namelen] = 0;
+
+       if (port_name)
+               port = atoi(port_name);
+
+       if (port == 0)
+               port = defaultport;
+
+       // 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 (addr_family != AF_INET6 &&
+               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)
+               {
+                       address->addr.in6.sin6_port = htons((unsigned short)port);
+                       return 1;
+               }
+               else if (address->addresstype == LHNETADDRESSTYPE_INET4)
+               {
+                       address->addr.in.sin_port = htons((unsigned short)port);
+                       return 1;
+               }
+               return 0;
+       }
+
+       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
+
+       // try resolving the address (handles dns and other ip formats)
+       resolved = LHNETADDRESS_Resolve(address, name, port);
+       if (resolved)
+       {
+#ifdef STANDALONETEST
+               const char *protoname;
+
+               switch (address->addresstype)
+               {
+                       case LHNETADDRESSTYPE_INET6:
+                               protoname = "ipv6";
+                               break;
+                       case LHNETADDRESSTYPE_INET4:
+                               protoname = "ipv4";
+                               break;
+                       default:
+                               protoname = "UNKNOWN";
+                               break;
+               }
+               LHNETADDRESS_ToString(vaddress, string2, sizeof(string2), 1);
+               Con_Printf("LHNETADDRESS_Resolve(\"%s\") returned %s address %s\n", string, protoname, string2);
+#endif
+               namecache[namecacheposition].address = *address;
+       }
+       else
+       {
+#ifdef STANDALONETEST
+               printf("name resolution failed on address \"%s\"\n", name);
+#endif
+               namecache[namecacheposition].address.addresstype = LHNETADDRESSTYPE_NONE;
+       }
+       
+       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;
@@ -203,8 +446,10 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de
                address->port = port;
                if (address->addresstype == LHNETADDRESSTYPE_INET6)
                {
+#ifdef SUPPORTIPV6
                        address->addr.in6.sin6_port = htons((unsigned short)port);
                        return 1;
+#endif
                }
                else if (address->addresstype == LHNETADDRESSTYPE_INET4)
                {
@@ -219,6 +464,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de
        {
                if (hostentry->h_addrtype == AF_INET6)
                {
+#ifdef SUPPORTIPV6
                        // great it worked
                        address->addresstype = LHNETADDRESSTYPE_INET6;
                        address->port = port;
@@ -238,6 +484,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de
                        printf("gethostbyname(\"%s\") returned ipv6 address %s\n", string, string2);
 #endif
                        return 1;
+#endif
                }
                else if (hostentry->h_addrtype == AF_INET)
                {
@@ -275,6 +522,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de
        namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
        return 0;
 }
+#endif
 
 int LHNETADDRESS_ToString(const lhnetaddress_t *vaddress, char *string, int stringbuffersize, int includeport)
 {
@@ -324,6 +572,7 @@ int LHNETADDRESS_ToString(const lhnetaddress_t *vaddress, char *string, int stri
                        }
                }
                break;
+#ifdef SUPPORTIPV6
        case LHNETADDRESSTYPE_INET6:
                a = (const unsigned char *)(&address->addr.in6.sin6_addr);
                if (includeport)
@@ -343,6 +592,7 @@ int LHNETADDRESS_ToString(const lhnetaddress_t *vaddress, char *string, int stri
                        }
                }
                break;
+#endif
        }
        return 0;
 }
@@ -355,6 +605,37 @@ int LHNETADDRESS_GetAddressType(const lhnetaddress_t *address)
                return LHNETADDRESSTYPE_NONE;
 }
 
+const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress)
+{
+#ifdef SUPPORTIPV6
+       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;
+
+#else
+
+               // 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)
+                       return ifname;
+
+#endif
+       }
+#endif
+
+       return NULL;
+}
+
 int LHNETADDRESS_GetPort(const lhnetaddress_t *address)
 {
        if (!address)
@@ -375,9 +656,11 @@ int LHNETADDRESS_SetPort(lhnetaddress_t *vaddress, int port)
        case LHNETADDRESSTYPE_INET4:
                address->addr.in.sin_port = htons((unsigned short)port);
                return 1;
+#ifdef SUPPORTIPV6
        case LHNETADDRESSTYPE_INET6:
                address->addr.in6.sin6_port = htons((unsigned short)port);
                return 1;
+#endif
        default:
                return 0;
        }
@@ -405,6 +688,7 @@ int LHNETADDRESS_Compare(const lhnetaddress_t *vaddress1, const lhnetaddress_t *
                if (address1->port != address2->port)
                        return -1;
                return 0;
+#ifdef SUPPORTIPV6
        case LHNETADDRESSTYPE_INET6:
                if (address1->addr.in6.sin6_family != address2->addr.in6.sin6_family)
                        return 1;
@@ -413,6 +697,7 @@ int LHNETADDRESS_Compare(const lhnetaddress_t *vaddress1, const lhnetaddress_t *
                if (address1->port != address2->port)
                        return -1;
                return 0;
+#endif
        default:
                return 1;
        }
@@ -538,6 +823,7 @@ static const char *LHNETPRIVATE_StrError(void)
 
 void LHNET_SleepUntilPacket_Microseconds(int microseconds)
 {
+#ifdef FD_SET
        fd_set fdreadset;
        struct timeval tv;
        int lastfd;
@@ -556,6 +842,9 @@ void LHNET_SleepUntilPacket_Microseconds(int microseconds)
        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)
@@ -603,55 +892,90 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
                        }
                        break;
                case LHNETADDRESSTYPE_INET4:
+#ifdef SUPPORTIPV6
                case LHNETADDRESSTYPE_INET6:
+#endif
 #ifdef WIN32
                        if (lhnet_didWSAStartup)
                        {
 #endif
+#ifdef SUPPORTIPV6
                                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
                                        {
-                                               lhnetaddressnative_t *localaddress = (lhnetaddressnative_t *)&lhnetsocket->address;
-                                               SOCKLEN_T namelen;
-                                               int bindresult;
-                                               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);
-                                               }
-                                               else
+#ifdef IPV6_V6ONLY
+                                               // We need to set this flag to tell the OS that we only listen on IPv6. If we don't
+                                               // most OSes will create a dual-protocol socket that also listens on IPv4. In this case
+                                               // if an IPv4 socket is already bound to the port we want, our bind() call will fail.
+                                               int ipv6_only = 1;
+                                               if (address->addresstype != LHNETADDRESSTYPE_INET6
+                                                       || setsockopt (lhnetsocket->inetsocket, IPPROTO_IPV6, IPV6_V6ONLY,
+                                                                                  (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)
+                                                       || SOCKETERRNO == WSAENOPROTOOPT
+#endif
+                                                       )
+#endif
                                                {
-                                                       namelen = sizeof(localaddress->addr.in);
-                                                       bindresult = bind(lhnetsocket->inetsocket, &localaddress->addr.sock, namelen);
+                                                       lhnetaddressnative_t *localaddress = (lhnetaddressnative_t *)&lhnetsocket->address;
+                                                       SOCKLEN_T namelen;
+                                                       int bindresult;
+#ifdef SUPPORTIPV6
+                                                       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);
+                                                       }
+                                                       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 (bindresult != -1)
-                                                               getsockname(lhnetsocket->inetsocket, &localaddress->addr.sock, &namelen);
-                                               }
-                                               if (bindresult != -1)
-                                               {
-                                                       int i = 1;
-                                                       // 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;
-                                                       lhnetsocket->prev->next = lhnetsocket;
+                                                       {
+                                                               int i = 1;
+                                                               // 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;
+                                                               lhnetsocket->prev->next = lhnetsocket;
 #ifdef WIN32
-                                                       if (ioctlsocket(lhnetsocket->inetsocket, SIO_UDP_CONNRESET, &_false) == -1)
-                                                               Con_DPrintf("LHNET_OpenSocket_Connectionless: ioctlsocket SIO_UDP_CONNRESET returned error: %s\n", LHNETPRIVATE_StrError());
+                                                               if (ioctlsocket(lhnetsocket->inetsocket, SIO_UDP_CONNRESET, &_false) == -1)
+                                                                       Con_DPrintf("LHNET_OpenSocket_Connectionless: ioctlsocket SIO_UDP_CONNRESET returned error: %s\n", LHNETPRIVATE_StrError());
 #endif
-                                                       return lhnetsocket;
+                                                               return lhnetsocket;
+                                                       }
+                                                       else
+                                                               Con_Printf("LHNET_OpenSocket_Connectionless: bind returned error: %s\n", LHNETPRIVATE_StrError());
                                                }
+#ifdef IPV6_V6ONLY
                                                else
-                                                       Con_Printf("LHNET_OpenSocket_Connectionless: bind returned error: %s\n", LHNETPRIVATE_StrError());
+                                                       Con_Printf("LHNET_OpenSocket_Connectionless: setsockopt(IPV6_V6ONLY) returned error: %s\n", LHNETPRIVATE_StrError());
+#endif
                                        }
                                        else
                                                Con_Printf("LHNET_OpenSocket_Connectionless: ioctlsocket returned error: %s\n", LHNETPRIVATE_StrError());
@@ -751,17 +1075,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)
@@ -775,12 +1099,13 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                        Con_Printf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
                }
        }
+#ifdef SUPPORTIPV6
        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, 0, &address->addr.sock, &inetaddresslength);
                if (value > 0)
                {
                        address->addresstype = LHNETADDRESSTYPE_INET6;
@@ -801,6 +1126,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
                        Con_Printf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
                }
        }
+#endif
        return value;
 }
 
@@ -833,7 +1159,7 @@ 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)
@@ -841,9 +1167,10 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
                        Con_Printf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
                }
        }
+#ifdef SUPPORTIPV6
        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)
@@ -851,6 +1178,7 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
                        Con_Printf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
                }
        }
+#endif
        return value;
 }