X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=lhnet.c;h=e2ded868e5508f268a6d8f49bc9b9267084f66f4;hb=ef1593610d977fe10d1f9225ab4f9111b02ef3fc;hp=c07866adaaf31cc039f58aac2179914fea24d956;hpb=5db790a83176c566b9f8339262f9da346abd900b;p=xonotic%2Fdarkplaces.git

diff --git a/lhnet.c b/lhnet.c
index c07866ad..e2ded868 100644
--- a/lhnet.c
+++ b/lhnet.c
@@ -535,9 +535,9 @@ int LHNETADDRESS_ToString(const lhnetaddress_t *vaddress, char *string, int stri
 {
 	lhnetaddressnative_t *address = (lhnetaddressnative_t *)vaddress;
 	const unsigned char *a;
-	*string = 0;
 	if (!address || !string || stringbuffersize < 1)
 		return 0;
+	*string = 0;
 	switch(address->addresstype)
 	{
 	default:
@@ -723,6 +723,7 @@ lhnetpacket_t;
 static int lhnet_active;
 static lhnetsocket_t lhnet_socketlist;
 static lhnetpacket_t lhnet_packetlist;
+static int lhnet_default_dscp = 0;
 #ifdef WIN32
 static int lhnet_didWSAStartup = 0;
 static WSADATA lhnet_winsockdata;
@@ -742,6 +743,18 @@ void LHNET_Init(void)
 #endif
 }
 
+int LHNET_DefaultDSCP(int dscp)
+{
+#ifdef IP_TOS
+	int prev = lhnet_default_dscp;
+	if(dscp >= 0)
+		lhnet_default_dscp = dscp;
+	return prev;
+#else
+	return -1;
+#endif
+}
+
 void LHNET_Shutdown(void)
 {
 	lhnetpacket_t *p;
@@ -945,13 +958,33 @@ 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)
 							{
 								namelen = sizeof(localaddress->addr.in6);
 								bindresult = bind(lhnetsocket->inetsocket, &localaddress->addr.sock, namelen);
 								if (bindresult != -1)
-									getsockname(lhnetsocket->inetsocket, &localaddress->addr.sock, &namelen);
+								{
+									if (getsockname(lhnetsocket->inetsocket, &localaddress->addr.sock, &namelen))
+									{
+										// If getsockname failed, we can assume the bound socket is useless.
+										bindresult = -1;
+									}
+								}
 							}
 							else
 #endif
@@ -959,13 +992,29 @@ lhnetsocket_t *LHNET_OpenSocket_Connectionless(lhnetaddress_t *address)
 								namelen = sizeof(localaddress->addr.in);
 								bindresult = bind(lhnetsocket->inetsocket, &localaddress->addr.sock, namelen);
 								if (bindresult != -1)
-									getsockname(lhnetsocket->inetsocket, &localaddress->addr.sock, &namelen);
+								{
+									if (getsockname(lhnetsocket->inetsocket, &localaddress->addr.sock, &namelen))
+									{
+										// If getsockname failed, we can assume the bound socket is useless.
+										bindresult = -1;
+									}
+								}
 							}
 							if (bindresult != -1)
 							{
 								int i = 1;
 								// enable broadcast on this socket
 								setsockopt(lhnetsocket->inetsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i));
+#ifdef IP_TOS
+								{
+									// enable DSCP for ToS support
+									int tos = lhnet_default_dscp << 2;
+									if (setsockopt(lhnetsocket->inetsocket, IPPROTO_IP, IP_TOS, (char *) &tos, sizeof(tos)))
+									{
+										// Error in setsockopt - fine, we'll simply set no TOS then.
+									}
+								}
+#endif
 								lhnetsocket->next = &lhnet_socketlist;
 								lhnetsocket->prev = lhnetsocket->next->prev;
 								lhnetsocket->next->prev = lhnetsocket;