aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-04-12 17:03:18 +0000
committerthilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-04-12 17:03:18 +0000
commite2fc91b8c2d90a91c2585ee5c2309b39698c3950 (patch)
tree35f7c1419f6db704fcc02ba5aab8f4db9f7a62ec
parent2f4b09a3fd677b7fb66723bd64358dd0798a2af5 (diff)
downloadioquake3-aero-e2fc91b8c2d90a91c2585ee5c2309b39698c3950.tar.gz
ioquake3-aero-e2fc91b8c2d90a91c2585ee5c2309b39698c3950.zip
Only don't send packet on disabled multicast if it actually is a multicast packet
git-svn-id: svn://svn.icculus.org/quake3/trunk@1313 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/qcommon/net_ip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/code/qcommon/net_ip.c b/code/qcommon/net_ip.c
index c481add..79ceb94 100644
--- a/code/qcommon/net_ip.c
+++ b/code/qcommon/net_ip.c
@@ -608,7 +608,7 @@ void Sys_SendPacket( int length, const void *data, netadr_t to ) {
(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 @@ void NET_JoinMulticast6(void)
{
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))