-// 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 _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
+# define _WIN32_WINNT 0x0501
# endif
+// To increase FD_SETSIZE (defaults to 64 on Windows)
+// it must be defined before the first inclusion of winsock2.h
+# define FD_SETSIZE 1024 // Matches Linux and BSD defaults
# include <winsock2.h>
# include <ws2tcpip.h>
# ifdef USE_WSPIAPI_H
#endif
#ifndef STANDALONETEST
-#include "quakedef.h"
+#include "darkplaces.h"
#endif
#include <stdlib.h>
#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
#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;
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)
#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;
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;
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;
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;
return 0;
}
-int LHNETADDRESS_GetAddressType(const lhnetaddress_t *address)
-{
- if (address)
- return address->addresstype;
- else
- return LHNETADDRESSTYPE_NONE;
-}
-
const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress, char *ifname, size_t ifnamelength)
{
#ifndef NOSUPPORTIPV6
#ifndef STANDALONETEST
double sentdoubletime;
#endif
- struct lhnetpacket_s *next, *prev;
+ llist_t list;
}
lhnetpacket_t;
static int lhnet_active;
-static lhnetsocket_t lhnet_socketlist;
+lhnetsocket_t lhnet_socketlist;
static lhnetpacket_t lhnet_packetlist;
static int lhnet_default_dscp = 0;
#ifdef WIN32
{
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);
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, lhnetsocket_t, list)
+ LHNET_CloseSocket(s);
+ List_For_Each_Entry_Safe(p, pnext, &lhnet_packetlist.list, lhnetpacket_t, list)
{
- p = lhnet_packetlist.next;
- p->prev->next = p->next;
- p->next->prev = p->prev;
+ List_Delete(&p->list);
Z_Free(p);
}
#ifdef WIN32
#endif
}
-void LHNET_SleepUntilPacket_Microseconds(int microseconds)
-{
-#ifdef FD_SET
- fd_set fdreadset;
- struct timeval tv;
- int lastfd;
- lhnetsocket_t *s;
- FD_ZERO(&fdreadset);
- lastfd = 0;
- for (s = lhnet_socketlist.next;s != &lhnet_socketlist;s = s->next)
- {
- if (s->address.addresstype == LHNETADDRESSTYPE_INET4 || s->address.addresstype == LHNETADDRESSTYPE_INET6)
- {
- 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)
{
lhnetsocket_t *lhnetsocket, *s;
lhnetsocket->address.port = 1024;
for (;;)
{
- for (s = lhnet_socketlist.next;s != &lhnet_socketlist;s = s->next)
+ List_For_Each_Entry(s, &lhnet_socketlist.list, lhnetsocket_t, list)
if (s->address.addresstype == lhnetsocket->address.addresstype && s->address.port == lhnetsocket->address.port)
break;
if (s == &lhnet_socketlist)
}
}
// 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, lhnetsocket_t, 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;
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
}
}
#endif
- 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);
#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 (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)
{
// 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, lhnetpacket_t, 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)
else
value = -1;
// unlink and free
- p->next->prev = p->prev;
- p->prev->next = p->next;
+ List_Delete(&p->list);
Z_Free(p);
}
}
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;
}
projects / xonotic / darkplaces.git / blobdiff