// Written by Forest Hale 2003-06-15 and placed into public domain.
-#ifdef SUPPORTIPV6
#ifdef WIN32
+#ifdef _MSC_VER
+#pragma comment(lib, "ws2_32.lib")
+#endif
+# 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
-#endif
#ifndef STANDALONETEST
#include "quakedef.h"
#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>
#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;
{
struct sockaddr sock;
struct sockaddr_in in;
+#ifdef SUPPORTIPV6
struct sockaddr_in6 in6;
+#endif
}
addr;
}
switch(addresstype)
{
default:
- return 0;
+ break;
case LHNETADDRESSTYPE_LOOP:
// local:port (loopback)
memset(address, 0, sizeof(*address));
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));
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)
+static int LHNETADDRESS_Resolve(lhnetaddressnative_t *address, const char *name, int port)
{
char port_buff [16];
struct addrinfo hints;
address->addresstype = LHNETADDRESSTYPE_NONE;
port = 0;
colon = strrchr(string, ':');
- if (colon)
+ 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)
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)
{
{
if (hostentry->h_addrtype == AF_INET6)
{
+#ifdef SUPPORTIPV6
// great it worked
address->addresstype = LHNETADDRESSTYPE_INET6;
address->port = port;
printf("gethostbyname(\"%s\") returned ipv6 address %s\n", string, string2);
#endif
return 1;
+#endif
}
else if (hostentry->h_addrtype == AF_INET)
{
}
}
break;
+#ifdef SUPPORTIPV6
case LHNETADDRESSTYPE_INET6:
a = (const unsigned char *)(&address->addr.in6.sin6_addr);
if (includeport)
}
}
break;
+#endif
}
return 0;
}
return LHNETADDRESSTYPE_NONE;
}
-const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress)
+const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress, char *ifname, size_t ifnamelength)
{
#ifdef SUPPORTIPV6
lhnetaddressnative_t *address = (lhnetaddressnative_t *)vaddress;
{
#ifndef _WIN32
- static char ifname [IF_NAMESIZE];
-
if (if_indextoname(address->addr.in6.sin6_scope_id, ifname) == ifname)
return ifname;
// 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
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;
}
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;
if (address1->port != address2->port)
return -1;
return 0;
+#endif
default:
return 1;
}
void LHNET_SleepUntilPacket_Microseconds(int microseconds)
{
+#ifdef FD_SET
fd_set fdreadset;
struct timeval tv;
int lastfd;
{
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)
}
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
{
#ifdef IPV6_V6ONLY
// We need to set this flag to tell the OS that we only listen on IPv6. If we don't
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
+
+#ifdef SUPPORTIPV6
if (address->addresstype == LHNETADDRESSTYPE_INET6)
{
namelen = sizeof(localaddress->addr.in6);
getsockname(lhnetsocket->inetsocket, &localaddress->addr.sock, &namelen);
}
else
+#endif
{
namelen = sizeof(localaddress->addr.in);
bindresult = bind(lhnetsocket->inetsocket, &localaddress->addr.sock, namelen);
SOCKLEN_T inetaddresslength;
address->addresstype = LHNETADDRESSTYPE_NONE;
inetaddresslength = sizeof(address->addr.in);
- value = recvfrom(lhnetsocket->inetsocket, (char *)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)
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());
}
}
+#ifdef SUPPORTIPV6
else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
{
SOCKLEN_T inetaddresslength;
address->addresstype = LHNETADDRESSTYPE_NONE;
inetaddresslength = sizeof(address->addr.in6);
- value = recvfrom(lhnetsocket->inetsocket, (char *)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;
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;
}
}
else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET4)
{
- value = sendto(lhnetsocket->inetsocket, (char *)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());
}
}
+#ifdef SUPPORTIPV6
else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
{
value = sendto(lhnetsocket->inetsocket, (char *)content, contentlength, 0, (struct sockaddr *)&address->addr.in6, sizeof(struct sockaddr_in6));
{
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;
}
projects / xonotic / darkplaces.git / blobdiff