X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=lhnet.c;h=fc1acf2b056724cc983cc8bbbb4be46bd332fd1c;hb=ef9d51a3182663ae22064b8cf91276aaf50c0129;hp=75cd5c64df261d1db8f374859256cab775c06154;hpb=ffc42cb750e2e3b941a79d4acf95e3a3f67f5058;p=xonotic%2Fdarkplaces.git

diff --git a/lhnet.c b/lhnet.c
index 75cd5c64..fc1acf2b 100644
--- a/lhnet.c
+++ b/lhnet.c
@@ -154,7 +154,7 @@ int LHNETADDRESS_FromPort(lhnetaddress_t *vaddress, lhnetaddresstype_t addressty
 }
 
 #ifdef SUPPORTIPV6
-int LHNETADDRESS_Resolve(lhnetaddressnative_t *address, const char *name, int port)
+static int LHNETADDRESS_Resolve(lhnetaddressnative_t *address, const char *name, int port)
 {
 	char port_buff [16];
 	struct addrinfo hints;
@@ -389,8 +389,12 @@ int LHNETADDRESS_FromString(lhnetaddress_t *vaddress, const char *string, int de
 	address->addresstype = LHNETADDRESSTYPE_NONE;
 	port = 0;
 	colon = strrchr(string, ':');
-	if (colon)
+	if (colon && (colon == strchr(string, ':') || (string[0] == '[' && colon - string > 0 && colon[-1] == ']')))
+	//           EITHER: colon is the ONLY colon  OR: colon comes after [...] delimited IPv6 address
+	//           fixes misparsing of IPv6 addresses without port
+	{
 		port = atoi(colon + 1);
+	}
 	else
 		colon = string + strlen(string);
 	if (port == 0)
@@ -608,7 +612,7 @@ int LHNETADDRESS_GetAddressType(const lhnetaddress_t *address)
 		return LHNETADDRESSTYPE_NONE;
 }
 
-const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress)
+const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress, char *ifname, size_t ifnamelength)
 {
 #ifdef SUPPORTIPV6
 	lhnetaddressnative_t *address = (lhnetaddressnative_t *)vaddress;
@@ -617,8 +621,6 @@ const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress)
 	{
 #ifndef _WIN32
 
-		static char ifname [IF_NAMESIZE];
-		
 		if (if_indextoname(address->addr.in6.sin6_scope_id, ifname) == ifname)
 			return ifname;
 
@@ -627,9 +629,7 @@ const char *LHNETADDRESS_GetInterfaceName(const lhnetaddress_t *vaddress)
 		// The Win32 API doesn't have if_indextoname() until Windows Vista,
 		// but luckily it just uses the interface ID as the interface name
 
-		static char ifname [16];
-
-		if (dpsnprintf(ifname, sizeof(ifname), "%lu", address->addr.in6.sin6_scope_id) > 0)
+		if (dpsnprintf(ifname, ifnamelength, "%lu", address->addr.in6.sin6_scope_id) > 0)
 			return ifname;
 
 #endif
@@ -945,6 +945,20 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
 							lhnetaddressnative_t *localaddress = (lhnetaddressnative_t *)&lhnetsocket->address;
 							SOCKLEN_T namelen;
 							int bindresult;
+
+#if defined(SOL_RFC1149) && defined(RFC1149_1149ONLY)
+							// we got reports of massive lags when this protocol was chosen as transport
+							// so better turn it off
+							{
+								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());
+								if(setsockopt(lhnetsocket->inetsocket, SOL_RFC1149, RFC1149_ENABLED, &rfc1149enabled))
+									Con_Printf("LHNET_OpenSocket_Connectionless: warning: setsockopt(RFC1149_ENABLED) returned error: %s\n", LHNETPRIVATE_StrError());
+							}
+#endif
+
 #ifdef SUPPORTIPV6
 							if (address->addresstype == LHNETADDRESSTYPE_INET6)
 							{
@@ -1103,7 +1117,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
 					Con_Print("Connection refused\n");
 					return 0;
 			}
-			Con_Printf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
+			Con_DPrintf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
 		}
 	}
 #ifdef SUPPORTIPV6
@@ -1130,7 +1144,7 @@ int LHNET_Read(lhnetsocket_t *lhnetsocket, void *content, int maxcontentlength,
 					Con_Print("Connection refused\n");
 					return 0;
 			}
-			Con_Printf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
+			Con_DPrintf("LHNET_Read: recvfrom returned error: %s\n", LHNETPRIVATE_StrError());
 		}
 	}
 #endif
@@ -1171,7 +1185,7 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
 		{
 			if (SOCKETERRNO == EWOULDBLOCK)
 				return 0;
-			Con_Printf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
+			Con_DPrintf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
 		}
 	}
 #ifdef SUPPORTIPV6
@@ -1182,7 +1196,7 @@ int LHNET_Write(lhnetsocket_t *lhnetsocket, const void *content, int contentleng
 		{
 			if (SOCKETERRNO == EWOULDBLOCK)
 				return 0;
-			Con_Printf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
+			Con_DPrintf("LHNET_Write: sendto returned error: %s\n", LHNETPRIVATE_StrError());
 		}
 	}
 #endif