r1313 - trunk/code/qcommon

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2008-04-12 13:03:18 -0400 (Sat, 12 Apr 2008)
New Revision: 1313

Modified:
   trunk/code/qcommon/net_ip.c
Log:
Only don't send packet on disabled multicast if it actually is a multicast packet


Modified: trunk/code/qcommon/net_ip.c
===================================================================
--- trunk/code/qcommon/net_ip.c	2008-04-12 17:00:18 UTC (rev 1312)
+++ trunk/code/qcommon/net_ip.c	2008-04-12 17:03:18 UTC (rev 1313)
@@ -608,7 +608,7 @@
 		(ip6_socket == INVALID_SOCKET && to.type == NA_MULTICAST6) )
 		return;
 
-	if(net_enabled->integer & NET_DISABLEMCAST)
+	if(to.type == NA_MULTICAST6 && (net_enabled->integer & NET_DISABLEMCAST))
 		return;
 
 	memset(&addr, 0, sizeof(addr));
@@ -950,7 +950,7 @@
 {
 	int err;
 	
-	if(ip6_socket == INVALID_SOCKET || multicast6_socket != INVALID_SOCKET || net_enabled->integer & NET_DISABLEMCAST)
+	if(ip6_socket == INVALID_SOCKET || multicast6_socket != INVALID_SOCKET || (net_enabled->integer & NET_DISABLEMCAST))
 		return;
 	
 	if(IN6_IS_ADDR_MULTICAST(&boundto.sin6_addr) || IN6_IS_ADDR_UNSPECIFIED(&boundto.sin6_addr))