X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=lhnet.c;h=58033bac8fe18646028a5621af32c318a558a675;hp=16cf41748734bcac2fded46bad9e4db14f4b3e08;hb=0dab13d8227daa31cf55e80977cef0397e7357c6;hpb=a01302832564d321dd2a544d2ee6f1eb5a618863

diff --git a/lhnet.c b/lhnet.c
index 16cf4174..58033bac 100644
--- a/lhnet.c
+++ b/lhnet.c
@@ -95,8 +95,23 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
 		address->addressdata.loop.port = port;
 		return 1;
 	}
-	// try to parse with gethostbyname first, because it can handle ipv4 and
-	// ipv6 (in various address formats), as well as dns names
+	// try to parse as dotted decimal ipv4 address first
+	if (sscanf(name, "%d.%d.%d.%d", &d1, &d2, &d3, &d4) == 4 && (unsigned int)d1 < 256 && (unsigned int)d2 < 256 && (unsigned int)d3 < 256 && (unsigned int)d4 < 256)
+	{
+		// parsed a valid ipv4 address
+		address->addresstype = LHNETADDRESSTYPE_INET4;
+		address->addressdata.inet4.family = LHNETADDRESSTYPE_INET4_FAMILY;
+		address->addressdata.inet4.port = htons((unsigned short)port);
+		address->addressdata.inet4.address[0] = (unsigned char)d1;
+		address->addressdata.inet4.address[1] = (unsigned char)d2;
+		address->addressdata.inet4.address[2] = (unsigned char)d3;
+		address->addressdata.inet4.address[3] = (unsigned char)d4;
+#ifdef STANDALONETEST
+		printf("manual parsing of ipv4 dotted decimal address \"%s\" successful: %d.%d.%d.%d:%d\n", string, (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
+		return 1;
+	}
+	// try gethostbyname (handles dns and other ip formats)
 	hostentry = gethostbyname(name);
 	if (hostentry)
 	{
@@ -125,25 +140,9 @@ int LHNETADDRESS_FromString(lhnetaddress_t *address, const char *string, int def
 			return 1;
 		}
 	}
-	// failed, try to parse as an ipv4 address as a fallback (is this needed?)
-#ifdef STANDALONETEST
-	printf("gethostbyname and gethostbyaddr failed on address \"%s\"\n", name);
-#endif
-	if (sscanf(name, "%d.%d.%d.%d", &d1, &d2, &d3, &d4) == 4 && (unsigned int)d1 < 256 && (unsigned int)d2 < 256 && (unsigned int)d3 < 256 && (unsigned int)d4 < 256)
-	{
-		// parsed a valid ipv4 address
-		address->addresstype = LHNETADDRESSTYPE_INET4;
-		address->addressdata.inet4.family = LHNETADDRESSTYPE_INET4_FAMILY;
-		address->addressdata.inet4.port = htons((unsigned short)port);
-		address->addressdata.inet4.address[0] = (unsigned char)d1;
-		address->addressdata.inet4.address[1] = (unsigned char)d2;
-		address->addressdata.inet4.address[2] = (unsigned char)d3;
-		address->addressdata.inet4.address[3] = (unsigned char)d4;
 #ifdef STANDALONETEST
-		printf("manual parsing of ipv4 dotted decimal address \"%s\" successful: %d.%d.%d.%d:%d\n", string, (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));
+	printf("gethostbyname failed on address \"%s\"\n", name);
 #endif
-		return 1;
-	}
 	return 0;
 }
 
@@ -340,6 +339,64 @@ void LHNET_Shutdown(void)
 	lhnet_active = 0;
 }
 
+static const char *LHNETPRIVATE_StrError(void)
+{
+#ifdef WIN32
+	int i = WSAGetLastError();
+	switch (i)
+	{
+		case WSAEINTR:           return "WSAEINTR";                                     
+		case WSAEBADF:           return "WSAEBADF";
+		case WSAEACCES:          return "WSAEACCES";          
+		case WSAEFAULT:          return "WSAEFAULT";
+		case WSAEINVAL:          return "WSAEINVAL";
+		case WSAEMFILE:          return "WSAEMFILE";
+		case WSAEWOULDBLOCK:     return "WSAEWOULDBLOCK";
+		case WSAEINPROGRESS:     return "WSAEINPROGRESS";
+		case WSAEALREADY:        return "WSAEALREADY";
+		case WSAENOTSOCK:        return "WSAENOTSOCK";
+		case WSAEDESTADDRREQ:    return "WSAEDESTADDRREQ";
+		case WSAEMSGSIZE:        return "WSAEMSGSIZE";
+		case WSAEPROTOTYPE:      return "WSAEPROTOTYPE";
+		case WSAENOPROTOOPT:     return "WSAENOPROTOOPT";
+		case WSAEPROTONOSUPPORT: return "WSAEPROTONOSUPPORT";
+		case WSAESOCKTNOSUPPORT: return "WSAESOCKTNOSUPPORT";
+		case WSAEOPNOTSUPP:      return "WSAEOPNOTSUPP";
+		case WSAEPFNOSUPPORT:    return "WSAEPFNOSUPPORT";
+		case WSAEAFNOSUPPORT:    return "WSAEAFNOSUPPORT";
+		case WSAEADDRINUSE:      return "WSAEADDRINUSE";
+		case WSAEADDRNOTAVAIL:   return "WSAEADDRNOTAVAIL";
+		case WSAENETDOWN:        return "WSAENETDOWN";
+		case WSAENETUNREACH:     return "WSAENETUNREACH";
+		case WSAENETRESET:       return "WSAENETRESET";
+		case WSAECONNABORTED:    return "WSAECONNABORTED";
+		case WSAECONNRESET:      return "WSAECONNRESET";
+		case WSAENOBUFS:         return "WSAENOBUFS";
+		case WSAEISCONN:         return "WSAEISCONN";
+		case WSAENOTCONN:        return "WSAENOTCONN";
+		case WSAESHUTDOWN:       return "WSAESHUTDOWN";
+		case WSAETOOMANYREFS:    return "WSAETOOMANYREFS";
+		case WSAETIMEDOUT:       return "WSAETIMEDOUT";
+		case WSAECONNREFUSED:    return "WSAECONNREFUSED";
+		case WSAELOOP:           return "WSAELOOP";
+		case WSAENAMETOOLONG:    return "WSAENAMETOOLONG";
+		case WSAEHOSTDOWN:       return "WSAEHOSTDOWN";
+		case WSAEHOSTUNREACH:    return "WSAEHOSTUNREACH";
+		case WSAENOTEMPTY:       return "WSAENOTEMPTY";
+		case WSAEPROCLIM:        return "WSAEPROCLIM";
+		case WSAEUSERS:          return "WSAEUSERS";
+		case WSAEDQUOT:          return "WSAEDQUOT";
+		case WSAESTALE:          return "WSAESTALE";
+		case WSAEREMOTE:         return "WSAEREMOTE";
+		case WSAEDISCON:         return "WSAEDISCON";
+		case 0:                  return "no error";
+		default:                 return "unknown WSAE error";  
+	}
+#else
+	return strerror(errno);
+#endif
+}
+
 lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
 {
 	lhnetsocket_t *lhnetsocket, *s;
@@ -387,17 +444,10 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
 		case LHNETADDRESSTYPE_INET4:
 		case LHNETADDRESSTYPE_INET6:
 #ifdef WIN32
-			if (!lhnet_didWSAStartup && !WSAStartup(MAKEWORD(1, 1), &lhnet_winsockdata))
-			{
-				lhnet_didWSAStartup = 1;
-#else
+			if (lhnet_didWSAStartup || (lhnet_didWSAStartup = !WSAStartup(MAKEWORD(1, 1), &lhnet_winsockdata)))
 			{
 #endif
-				if (address->addresstype == LHNETADDRESSTYPE_INET6)
-					lhnetsocket->inetsocket = socket(LHNETADDRESSTYPE_INET6_FAMILY, SOCK_DGRAM, IPPROTO_UDP);
-				else
-					lhnetsocket->inetsocket = socket(LHNETADDRESSTYPE_INET4_FAMILY, SOCK_DGRAM, IPPROTO_UDP);
-				if (lhnetsocket->inetsocket != -1)
+				if ((lhnetsocket->inetsocket = socket(address->addresstype == LHNETADDRESSTYPE_INET6 ? LHNETADDRESSTYPE_INET6_FAMILY : LHNETADDRESSTYPE_INET4_FAMILY, SOCK_DGRAM, IPPROTO_UDP)) != -1)
 				{
 #ifdef WIN32
 					u_long _true = 1;
@@ -415,14 +465,24 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
 							lhnetsocket->prev->next = lhnetsocket;
 							return lhnetsocket;
 						}
+						else
+							Con_Printf("LHNET_OpenSocket_Connectionless: bind returned error: %s\n", LHNETPRIVATE_StrError());
 					}
+					else
+						Con_Printf("LHNET_OpenSocket_Connectionless: ioctlsocket returned error: %s\n", LHNETPRIVATE_StrError());
 #ifdef WIN32
 					closesocket(lhnetsocket->inetsocket);
 #else
 					close(lhnetsocket->inetsocket);
 #endif
 				}
+				else
+					Con_Printf("LHNET_OpenSocket_Connectionless: socket returned error: %s\n", LHNETPRIVATE_StrError());
+#ifdef WIN32
 			}
+			else
+				Con_Print("LHNET_OpenSocket_Connectionless: WSAStartup failed\n");
+#endif
 			break;
 		default:
 			break;
@@ -537,7 +597,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
 			switch (e)
 			{
 				case WSAECONNREFUSED:
-					Con_Printf("Connection refused\n");
+					Con_Print("Connection refused\n");
 					return 0;
 			}
 #else
@@ -546,7 +606,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
 			switch (errno)
 			{
 				case ECONNREFUSED:
-					Con_Printf("Connection refused\n");
+					Con_Print("Connection refused\n");
 					return 0;
 			}
 #endif
@@ -572,7 +632,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
 			switch (e)
 			{
 				case WSAECONNREFUSED:
-					Con_Printf("Connection refused\n");
+					Con_Print("Connection refused\n");
 					return 0;
 			}
 #else
@@ -581,7 +641,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
 			switch (errno)
 			{
 				case ECONNREFUSED:
-					Con_Printf("Connection refused\n");
+					Con_Print("Connection refused\n");
 					return 0;
 			}
 #endif
@@ -612,8 +672,8 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
 		p->next->prev = p;
 		p->prev->next = p;
 #ifndef STANDALONETEST
-		if (cl_fakelocalping_min.integer || cl_fakelocalping_max.integer)
-			p->sentdoubletime = Sys_DoubleTime() + (cl_fakelocalping_min.integer + ((cl_fakelocalping_max.integer - cl_fakelocalping_min.integer) * (rand() & 255) / 256)) / 1000.0;
+		if (cl_fakelocalping_min.value || cl_fakelocalping_max.value)
+			p->sentdoubletime = Sys_DoubleTime() + lhrandom(cl_fakelocalping_min.value, cl_fakelocalping_max.value) * (0.5 / 1000.0);
 #endif
 		value = contentlength;
 	}