diff options
author | Nivedita Singhvi <niv@us.ibm.com> | 2009-05-28 07:00:46 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-02 00:45:24 -0700 |
commit | f771bef98004d9d141b085d987a77d06669d4f4f (patch) | |
tree | df9b7a353a8c28e71a8237d3ad65ba7f41ffab30 /net/ipv4/igmp.c | |
parent | 4d52cfbef6266092d535237ba5a4b981458ab171 (diff) | |
download | linux-f771bef98004d9d141b085d987a77d06669d4f4f.tar.bz2 |
ipv4: New multicast-all socket option
After some discussion offline with Christoph Lameter and David Stevens
regarding multicast behaviour in Linux, I'm submitting a slightly
modified patch from the one Christoph submitted earlier.
This patch provides a new socket option IP_MULTICAST_ALL.
In this case, default behaviour is _unchanged_ from the current
Linux standard. The socket option is set by default to provide
original behaviour. Sockets wishing to receive data only from
multicast groups they join explicitly will need to clear this
socket option.
Signed-off-by: Nivedita Singhvi <niv@us.ibm.com>
Signed-off-by: Christoph Lameter<cl@linux.com>
Acked-by: David Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/igmp.c')
-rw-r--r-- | net/ipv4/igmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 9eb6219af615..e6058a503796 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -2196,7 +2196,7 @@ int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif) break; } if (!pmc) - return 1; + return inet->mc_all; psl = pmc->sflist; if (!psl) return pmc->sfmode == MCAST_EXCLUDE; |