X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=lhnet.c;h=3ac17a0aad880a6b4d912345ca7626d3e1ee268f;hp=e3bc6b712186f54dd511fd4165ddfc2f54fa3c88;hb=1eb6c9f7bf5f6966b47e25284e1fe3a60751107b;hpb=3368a3b1dd0e71f33bc40c8fe47ad5b2a0255d2f diff --git a/lhnet.c b/lhnet.c index e3bc6b71..3ac17a0a 100644 --- a/lhnet.c +++ b/lhnet.c @@ -5,7 +5,7 @@ #ifdef _MSC_VER #pragma comment(lib, "ws2_32.lib") #endif -# ifdef SUPPORTIPV6 +# 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 @@ -33,7 +33,7 @@ #include #include #include -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 #include #endif #endif @@ -57,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 @@ -97,7 +100,7 @@ typedef struct lhnetaddressnative_s { struct sockaddr sock; struct sockaddr_in in; -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 struct sockaddr_in6 in6; #endif } @@ -139,7 +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; -#ifdef SUPPORTIPV6 +#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)); @@ -153,7 +156,7 @@ int LHNETADDRESS_FromPort(lhnetaddress_t *vaddress, lhnetaddresstype_t addressty return 0; } -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 static int LHNETADDRESS_Resolve(lhnetaddressnative_t *address, const char *name, int port) { char port_buff [16]; @@ -453,7 +456,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de address->port = port; if (address->addresstype == LHNETADDRESSTYPE_INET6) { -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 address->addr.in6.sin6_port = htons((unsigned short)port); return 1; #endif @@ -471,7 +474,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de { if (hostentry->h_addrtype == AF_INET6) { -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 // great it worked address->addresstype = LHNETADDRESSTYPE_INET6; address->port = port; @@ -535,9 +538,9 @@ int LHNETADDRESS_ToString(const lhnetaddress_t *vaddress, char *string, int stri { 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: @@ -579,7 +582,7 @@ int LHNETADDRESS_ToString(const lhnetaddress_t *vaddress, char *string, int stri } } break; -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 case LHNETADDRESSTYPE_INET6: a = (const unsigned char *)(&address->addr.in6.sin6_addr); if (includeport) @@ -614,7 +617,7 @@ int LHNETADDRESS_GetAddressType(const lhnetaddress_t *address) const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress, char *ifname, size_t ifnamelength) { -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 lhnetaddressnative_t *address = (lhnetaddressnative_t *)vaddress; if (address && address->addresstype == LHNETADDRESSTYPE_INET6) @@ -659,7 +662,7 @@ int LHNETADDRESS_SetPort(lhnetaddress_t *vaddress, int port) case LHNETADDRESSTYPE_INET4: address->addr.in.sin_port = htons((unsigned short)port); return 1; -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 case LHNETADDRESSTYPE_INET6: address->addr.in6.sin6_port = htons((unsigned short)port); return 1; @@ -691,7 +694,7 @@ int LHNETADDRESS_Compare(const lhnetaddress_t *vaddress1, const lhnetaddress_t * if (address1->port != address2->port) return -1; return 0; -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 case LHNETADDRESSTYPE_INET6: if (address1->addr.in6.sin6_family != address2->addr.in6.sin6_family) return 1; @@ -912,14 +915,14 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address) } break; case LHNETADDRESSTYPE_INET4: -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 case LHNETADDRESSTYPE_INET6: #endif #ifdef WIN32 if (lhnet_didWSAStartup) { #endif -#ifdef SUPPORTIPV6 +#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) @@ -972,13 +975,19 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address) } #endif -#ifdef SUPPORTIPV6 +#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 @@ -986,7 +995,13 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address) 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) { @@ -997,7 +1012,10 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address) { // enable DSCP for ToS support int tos = lhnet_default_dscp << 2; - setsockopt(lhnetsocket->inetsocket, IPPROTO_IP, IP_TOS, (char *) &tos, sizeof(tos)); + 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; @@ -1140,7 +1158,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength, Con_DPrintf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError()); } } -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6) { SOCKLEN_T inetaddresslength; @@ -1208,7 +1226,7 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng Con_DPrintf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError()); } } -#ifdef SUPPORTIPV6 +#ifndef NOSUPPORTIPV6 else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6) { value = sendto(lhnetsocket->inetsocket, (char *)content, contentlength, 0, (struct sockaddr *)&address->addr.in6, sizeof(struct sockaddr_in6));