#ifdef WIN32
#include <winsock.h>
#else
-#include <netdb.h>
-#include <netinet/in.h>
-//#include <arpa/inet.h>
#include <unistd.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#endif
// for Z_Malloc/Z_Free in quake
#include "lhnet.h"
+// to make LHNETADDRESS_FromString resolve repeated hostnames faster, cache them
+#define MAX_NAMECACHE 64
+static struct namecache_s
+{
+ lhnetaddress_t address;
+ char name[64];
+}
+namecache[MAX_NAMECACHE];
+static int namecacheposition = 0;
+
int LHNETADDRESS_FromPort(lhnetaddress_t *address, int addresstype, int port)
{
if (!address)
int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int defaultport)
{
- int port, namelen, d1, d2, d3, d4;
+ int i, port, namelen, d1, d2, d3, d4;
struct hostent *hostentry;
const char *colon;
char name[128];
#endif
return 1;
}
+ for (i = 0;i < MAX_NAMECACHE;i++)
+ if (!strcmp(namecache[i].name, name))
+ break;
+ if (i < MAX_NAMECACHE)
+ {
+ *address = namecache[i].address;
+ if (address->addresstype == LHNETADDRESSTYPE_INET6)
+ {
+ address->addressdata.inet6.port = htons((unsigned short)port);
+ return 1;
+ }
+ else if (address->addresstype == LHNETADDRESSTYPE_INET4)
+ {
+ address->addressdata.inet4.port = htons((unsigned short)port);
+ return 1;
+ }
+ return false;
+ }
// try gethostbyname (handles dns and other ip formats)
hostentry = gethostbyname(name);
if (hostentry)
address->addressdata.inet6.family = hostentry->h_addrtype;
address->addressdata.inet6.port = htons((unsigned short)port);
memcpy(address->addressdata.inet6.address, hostentry->h_addr_list[0], sizeof(address->addressdata.inet6.address));
+ for (i = 0;i < sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+ namecache[namecacheposition].name[i] = name[i];
+ namecache[namecacheposition].name[i] = 0;
+ namecache[namecacheposition].address = *address;
+ namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
#ifdef STANDALONETEST
printf("gethostbyname(\"%s\") returned ipv6 address [%x:%x:%x:%x:%x:%x:%x:%x]:%d\n", name, (int)address->addressdata.inet6.address[0], (int)address->addressdata.inet6.address[1], (int)address->addressdata.inet6.address[2], (int)address->addressdata.inet6.address[3], (int)address->addressdata.inet6.address[4], (int)address->addressdata.inet6.address[5], (int)address->addressdata.inet6.address[6], (int)address->addressdata.inet6.address[7], (int)ntohs(address->addressdata.inet6.port));
#endif
address->addressdata.inet4.family = hostentry->h_addrtype;
address->addressdata.inet4.port = htons((unsigned short)port);
memcpy(address->addressdata.inet4.address, hostentry->h_addr_list[0], sizeof(address->addressdata.inet4.address));
+ for (i = 0;i < sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+ namecache[namecacheposition].name[i] = name[i];
+ namecache[namecacheposition].name[i] = 0;
+ namecache[namecacheposition].address = *address;
+ namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
#ifdef STANDALONETEST
printf("gethostbyname(\"%s\") returned ipv4 address %d.%d.%d.%d:%d\n", name, (int)address->addressdata.inet4.address[0], (int)address->addressdata.inet4.address[1], (int)address->addressdata.inet4.address[2], (int)address->addressdata.inet4.address[3], (int)ntohs(address->addressdata.inet4.port));
#endif
#ifdef STANDALONETEST
printf("gethostbyname failed on address \"%s\"\n", name);
#endif
+ for (i = 0;i < sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+ namecache[namecacheposition].name[i] = name[i];
+ namecache[namecacheposition].name[i] = 0;
+ namecache[namecacheposition].address.addresstype = LHNETADDRESSTYPE_NONE;
+ namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
return 0;
}
int i = WSAGetLastError();
switch (i)
{
- case WSAEINTR: return "WSAEINTR";
+ case WSAEINTR: return "WSAEINTR";
case WSAEBADF: return "WSAEBADF";
- case WSAEACCES: return "WSAEACCES";
+ case WSAEACCES: return "WSAEACCES";
case WSAEFAULT: return "WSAEFAULT";
case WSAEINVAL: return "WSAEINVAL";
case WSAEMFILE: return "WSAEMFILE";
case WSAEREMOTE: return "WSAEREMOTE";
case WSAEDISCON: return "WSAEDISCON";
case 0: return "no error";
- default: return "unknown WSAE error";
+ default: return "unknown WSAE error";
}
#else
return strerror(errno);
namelen = address->addresstype == LHNETADDRESSTYPE_INET6 ? sizeof(lhnetsocket->address.addressdata.inet6) : sizeof(lhnetsocket->address.addressdata.inet4);
if (bind(lhnetsocket->inetsocket, (void *)&lhnetsocket->address.addressdata, namelen) != -1)
{
+ int i = 1;
getsockname(lhnetsocket->inetsocket, (void *)&lhnetsocket->address.addressdata, &namelen);
+ // 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;
continue;
}
#ifndef STANDALONETEST
- if (p->sentdoubletime && Sys_DoubleTime() < p->sentdoubletime)
+ if (cl_netlocalping.value && (Sys_DoubleTime() - cl_netlocalping.value * (1.0 / 2000.0)) < p->sentdoubletime)
continue;
#endif
if (value == 0 && p->destinationport == lhnetsocket->address.addressdata.loop.port)
p->next->prev = p;
p->prev->next = p;
#ifndef STANDALONETEST
- if (cl_netlocalping_min.value || cl_netlocalping_max.value)
- p->sentdoubletime = Sys_DoubleTime() + lhrandom(cl_netlocalping_min.value, cl_netlocalping_max.value) * (0.5 / 1000.0);
+ p->sentdoubletime = Sys_DoubleTime();
#endif
value = contentlength;
}