Only don't send packet on disabled multicast if it actually is a multicast packet

This commit is contained in:
Thilo Schulz 2008-04-12 17:03:18 +00:00
parent f8d8a1c2f7
commit eb74549dde

View file

@ -608,7 +608,7 @@ void Sys_SendPacket( int length, const void *data, netadr_t to ) {
(ip6_socket == INVALID_SOCKET && to.type == NA_MULTICAST6) ) (ip6_socket == INVALID_SOCKET && to.type == NA_MULTICAST6) )
return; return;
if(net_enabled->integer & NET_DISABLEMCAST) if(to.type == NA_MULTICAST6 && (net_enabled->integer & NET_DISABLEMCAST))
return; return;
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
@ -950,7 +950,7 @@ void NET_JoinMulticast6(void)
{ {
int err; 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; return;
if(IN6_IS_ADDR_MULTICAST(&boundto.sin6_addr) || IN6_IS_ADDR_UNSPECIFIED(&boundto.sin6_addr)) if(IN6_IS_ADDR_MULTICAST(&boundto.sin6_addr) || IN6_IS_ADDR_UNSPECIFIED(&boundto.sin6_addr))