X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=lhnet.c;h=fff523dd3ece9da7f64aa0e3d4bfecd5da546666;hp=fc1acf2b056724cc983cc8bbbb4be46bd332fd1c;hb=9becec9419d9a20c7d373b14e1106d5f0ce78494;hpb=fa561c1a0e1f754cab309168853a0e3b253081c8 diff --git a/lhnet.c b/lhnet.c index fc1acf2b..fff523dd 100644 --- a/lhnet.c +++ b/lhnet.c @@ -1,11 +1,11 @@ -// Written by Forest Hale 2003-06-15 and placed into public domain. +// Written by Ashley Rose Hale (LadyHavoc) 2003-06-15 and placed into public domain. #ifdef WIN32 #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 @@ -17,7 +17,7 @@ #endif #ifndef STANDALONETEST -#include "quakedef.h" +#include "darkplaces.h" #endif #include @@ -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]; @@ -311,7 +314,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de #ifdef STANDALONETEST if (i < MAX_NAMECACHE) #else - if (i < MAX_NAMECACHE && realtime < namecache[i].expirationtime) + if (i < MAX_NAMECACHE && host.realtime < namecache[i].expirationtime) #endif { *address = namecache[i].address; @@ -333,7 +336,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de namecache[namecacheposition].name[i] = name[i]; namecache[namecacheposition].name[i] = 0; #ifndef STANDALONETEST - namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours + namecache[namecacheposition].expirationtime = host.realtime + 12 * 3600; // 12 hours #endif // try resolving the address (handles dns and other ip formats) @@ -446,14 +449,14 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de #ifdef STANDALONETEST if (i < MAX_NAMECACHE) #else - if (i < MAX_NAMECACHE && realtime < namecache[i].expirationtime) + if (i < MAX_NAMECACHE && host.realtime < namecache[i].expirationtime) #endif { *address = namecache[i].address; 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; @@ -482,7 +485,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de namecache[namecacheposition].name[i] = name[i]; namecache[namecacheposition].name[i] = 0; #ifndef STANDALONETEST - namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours + namecache[namecacheposition].expirationtime = host.realtime + 12 * 3600; // 12 hours #endif namecache[namecacheposition].address = *address; namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE; @@ -505,7 +508,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de namecache[namecacheposition].name[i] = name[i]; namecache[namecacheposition].name[i] = 0; #ifndef STANDALONETEST - namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours + namecache[namecacheposition].expirationtime = host.realtime + 12 * 3600; // 12 hours #endif namecache[namecacheposition].address = *address; namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE; @@ -523,7 +526,7 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de namecache[namecacheposition].name[i] = name[i]; namecache[namecacheposition].name[i] = 0; #ifndef STANDALONETEST - namecache[namecacheposition].expirationtime = realtime + 12 * 3600; // 12 hours + namecache[namecacheposition].expirationtime = host.realtime + 12 * 3600; // 12 hours #endif namecache[namecacheposition].address.addresstype = LHNETADDRESSTYPE_NONE; namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE; @@ -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; @@ -716,13 +719,14 @@ typedef struct lhnetpacket_s #ifndef STANDALONETEST double sentdoubletime; #endif - struct lhnetpacket_s *next, *prev; + llist_t list; } 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; @@ -732,8 +736,8 @@ void LHNET_Init(void) { if (lhnet_active) return; - lhnet_socketlist.next = lhnet_socketlist.prev = &lhnet_socketlist; - lhnet_packetlist.next = lhnet_packetlist.prev = &lhnet_packetlist; + List_Create(&lhnet_socketlist.list); + List_Create(&lhnet_packetlist.list); lhnet_active = 1; #ifdef WIN32 lhnet_didWSAStartup = !WSAStartup(MAKEWORD(1, 1), &lhnet_winsockdata); @@ -742,18 +746,29 @@ 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; + lhnetsocket_t *s, *snext; + lhnetpacket_t *p, *pnext; if (!lhnet_active) return; - while (lhnet_socketlist.next != &lhnet_socketlist) - LHNET_CloseSocket(lhnet_socketlist.next); - while (lhnet_packetlist.next != &lhnet_packetlist) + List_For_Each_Entry_Safe(s, snext, &lhnet_socketlist.list, list) + LHNET_CloseSocket(s); + List_For_Each_Entry_Safe(p, pnext, &lhnet_packetlist.list, list) { - p = lhnet_packetlist.next; - p->prev->next = p->next; - p->next->prev = p->prev; + List_Delete(&p->list); Z_Free(p); } #ifdef WIN32 @@ -833,7 +848,7 @@ void LHNET_SleepUntilPacket_Microseconds(int microseconds) lhnetsocket_t *s; FD_ZERO(&fdreadset); lastfd = 0; - for (s = lhnet_socketlist.next;s != &lhnet_socketlist;s = s->next) + List_For_Each_Entry(s, &lhnet_socketlist.list, list) { if (s->address.addresstype == LHNETADDRESSTYPE_INET4 || s->address.addresstype == LHNETADDRESSTYPE_INET6) { @@ -877,7 +892,7 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address) lhnetsocket->address.port = 1024; for (;;) { - for (s = lhnet_socketlist.next;s != &lhnet_socketlist;s = s->next) + List_For_Each_Entry(s, &lhnet_socketlist.list, list) if (s->address.addresstype == lhnetsocket->address.addresstype && s->address.port == lhnetsocket->address.port) break; if (s == &lhnet_socketlist) @@ -886,27 +901,24 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address) } } // check if the port is available - for (s = lhnet_socketlist.next;s != &lhnet_socketlist;s = s->next) + List_For_Each_Entry(s, &lhnet_socketlist.list, list) if (s->address.addresstype == lhnetsocket->address.addresstype && s->address.port == lhnetsocket->address.port) break; if (s == &lhnet_socketlist && lhnetsocket->address.port != 0) { - lhnetsocket->next = &lhnet_socketlist; - lhnetsocket->prev = lhnetsocket->next->prev; - lhnetsocket->next->prev = lhnetsocket; - lhnetsocket->prev->next = lhnetsocket; + List_Add_Tail(&lhnetsocket->list, &lhnet_socketlist.list); return lhnetsocket; } 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) @@ -953,19 +965,25 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address) 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()); + Con_Printf(CON_ERROR "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()); + Con_Printf(CON_ERROR "LHNET_OpenSocket_Connectionless: warning: setsockopt(RFC1149_ENABLED) returned error: %s\n", LHNETPRIVATE_StrError()); } #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 @@ -973,17 +991,30 @@ 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) { 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 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 + List_Add_Tail(&lhnetsocket->list, &lhnet_socketlist.list); #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()); @@ -1022,14 +1053,7 @@ void LHNET_CloseSocket(lhnetsocket_t *lhnetsocket) { if (lhnetsocket) { - // unlink from socket list - if (lhnetsocket->next == NULL) - return; // invalid! - lhnetsocket->next->prev = lhnetsocket->prev; - lhnetsocket->prev->next = lhnetsocket->next; - lhnetsocket->next = NULL; - lhnetsocket->prev = NULL; - + List_Delete(&lhnetsocket->list); // no special close code for loopback, just inet if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET4 || lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6) { @@ -1060,19 +1084,17 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength, // scan for any old packets to timeout while searching for a packet // that is waiting to be delivered to this socket currenttime = time(NULL); - for (p = lhnet_packetlist.next;p != &lhnet_packetlist;p = pnext) + List_For_Each_Entry_Safe(p, pnext, &lhnet_packetlist.list, list) { - pnext = p->next; if (p->timeout < currenttime) { // unlink and free - p->next->prev = p->prev; - p->prev->next = p->next; + List_Delete(&p->list); Z_Free(p); continue; } #ifndef STANDALONETEST - if (cl_netlocalping.value && (realtime - cl_netlocalping.value * (1.0 / 2000.0)) < p->sentdoubletime) + if (net_fakelag.value && (host.realtime - net_fakelag.value * (1.0 / 2000.0)) < p->sentdoubletime) continue; #endif if (value == 0 && p->destinationport == lhnetsocket->address.port) @@ -1088,8 +1110,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength, else value = -1; // unlink and free - p->next->prev = p->prev; - p->prev->next = p->next; + List_Delete(&p->list); Z_Free(p); } } @@ -1120,7 +1141,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; @@ -1169,12 +1190,10 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng p->sourceport = lhnetsocket->address.port; p->destinationport = address->port; p->timeout = time(NULL) + 10; - p->next = &lhnet_packetlist; - p->prev = p->next->prev; - p->next->prev = p; - p->prev->next = p; + List_Add_Tail(&p->list, &lhnet_packetlist.list); + #ifndef STANDALONETEST - p->sentdoubletime = realtime; + p->sentdoubletime = host.realtime; #endif value = contentlength; } @@ -1188,7 +1207,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));