X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=lhnet.c;h=b7b0c3632356cd704742baaa7b6d448fda3d5362;hb=9cc276c2e36a6fc6cfafd8a0fb6df85e2f644c07;hp=f7de35abfa8bcda4d931eafc268319b46eda0d67;hpb=1a2b98e32263b109293c5f47ecd6bca51b149d88;p=xonotic%2Fdarkplaces.git

diff --git a/lhnet.c b/lhnet.c
index f7de35ab..b7b0c363 100644
--- a/lhnet.c
+++ b/lhnet.c
@@ -32,6 +32,17 @@
 
 #include "lhnet.h"
 
+// to make LHNETADDRESS_FromString resolve repeated hostnames faster, cache them
+#define MAX_NAMECACHE 64
+static struct namecache_s
+{
+	lhnetaddress_t address;
+	double expirationtime;
+	char name[64];
+}
+namecache[MAX_NAMECACHE];
+static int namecacheposition = 0;
+
 int LHNETADDRESS_FromPort(lhnetaddress_t *address, int addresstype, int port)
 {
 	if (!address)
@@ -64,7 +75,7 @@ int LHNETADDRESS_FromPort(lhnetaddress_t *address, int addresstype, int port)
 
 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];
@@ -113,6 +124,24 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
 #endif
 		return 1;
 	}
+	for (i = 0;i < MAX_NAMECACHE;i++)
+		if (!strcmp(namecache[i].name, name))
+			break;
+	if (i < MAX_NAMECACHE && Sys_DoubleTime() < namecache[i].expirationtime)
+	{
+		*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)
@@ -124,6 +153,12 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
 			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 < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+				namecache[namecacheposition].name[i] = name[i];
+			namecache[namecacheposition].name[i] = 0;
+			namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+			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
@@ -136,6 +171,12 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
 			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 < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+				namecache[namecacheposition].name[i] = name[i];
+			namecache[namecacheposition].name[i] = 0;
+			namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+			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
@@ -145,6 +186,12 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
 #ifdef STANDALONETEST
 	printf("gethostbyname failed on address \"%s\"\n", name);
 #endif
+	for (i = 0;i < (int)sizeof(namecache[namecacheposition].name)-1 && name[i];i++)
+		namecache[namecacheposition].name[i] = name[i];
+	namecache[namecacheposition].name[i] = 0;
+	namecache[namecacheposition].expirationtime = Sys_DoubleTime() + 12 * 3600; // 12 hours
+	namecache[namecacheposition].address.addresstype = LHNETADDRESSTYPE_NONE;
+	namecacheposition = (namecacheposition + 1) % MAX_NAMECACHE;
 	return 0;
 }
 
@@ -404,7 +451,7 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
 	lhnetsocket_t *lhnetsocket, *s;
 	if (!address)
 		return NULL;
-	lhnetsocket = Z_Malloc(sizeof(*lhnetsocket));
+	lhnetsocket = (lhnetsocket_t *)Z_Malloc(sizeof(*lhnetsocket));
 	if (lhnetsocket)
 	{
 		memset(lhnetsocket, 0, sizeof(*lhnetsocket));
@@ -465,10 +512,10 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
 						socklen_t namelen;
 #endif
 						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)
+						if (bind(lhnetsocket->inetsocket, (struct sockaddr *)&lhnetsocket->address.addressdata, namelen) != -1)
 						{
 							int i = 1;
-							getsockname(lhnetsocket->inetsocket, (void *)&lhnetsocket->address.addressdata, &namelen);
+							getsockname(lhnetsocket->inetsocket, (struct sockaddr *)&lhnetsocket->address.addressdata, &namelen);
 							// enable broadcast on this socket
 							setsockopt(lhnetsocket->inetsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i));
 							lhnetsocket->next = &lhnet_socketlist;
@@ -591,7 +638,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
 	}
 	else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET4)
 	{
-		int inetaddresslength;
+		unsigned int inetaddresslength;
 		address->addresstype = LHNETADDRESSTYPE_NONE;
 		inetaddresslength = sizeof(address->addressdata.inet4);
 		value = recvfrom(lhnetsocket->inetsocket, content, maxcontentlength, 0, (struct sockaddr *)&address->addressdata.inet4, &inetaddresslength);
@@ -626,7 +673,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
 	}
 	else if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_INET6)
 	{
-		int inetaddresslength;
+		unsigned int inetaddresslength;
 		address->addresstype = LHNETADDRESSTYPE_NONE;
 		inetaddresslength = sizeof(address->addressdata.inet6);
 		value = recvfrom(lhnetsocket->inetsocket, content, maxcontentlength, 0, (struct sockaddr *)&address->addressdata.inet6, &inetaddresslength);
@@ -672,7 +719,7 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
 	if (lhnetsocket->address.addresstype == LHNETADDRESSTYPE_LOOP)
 	{
 		lhnetpacket_t *p;
-		p = Z_Malloc(sizeof(*p) + contentlength);
+		p = (lhnetpacket_t *)Z_Malloc(sizeof(*p) + contentlength);
 		p->data = (void *)(p + 1);
 		memcpy(p->data, content, contentlength);
 		p->length = contentlength;