kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ipv4: New multicast-all socket option

Browse source 
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>
This commit is contained in:
Nivedita Singhvi 2009-05-28 07:00:46 +00:00 committed by David S. Miller
parent 4d52cfbef6
commit f771bef980
5 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/linux/in.h
View file

@ -107,6 +107,7 @@ struct in_addr {
#define MCAST_JOIN_SOURCE_GROUP 46 #define MCAST_JOIN_SOURCE_GROUP 46
#define MCAST_LEAVE_SOURCE_GROUP 47 #define MCAST_LEAVE_SOURCE_GROUP 47
#define MCAST_MSFILTER 48 #define MCAST_MSFILTER 48
#define IP_MULTICAST_ALL 49
#define MCAST_EXCLUDE 0 #define MCAST_EXCLUDE 0
#define MCAST_INCLUDE 1 #define MCAST_INCLUDE 1

3
include/net/inet_sock.h
View file

@ -130,7 +130,8 @@ struct inet_sock {
freebind:1, freebind:1,
hdrincl:1, hdrincl:1,
mc_loop:1, mc_loop:1,
transparent:1; transparent:1,
mc_all:1;
int mc_index; int mc_index;
__be32 mc_addr; __be32 mc_addr;
struct ip_mc_socklist *mc_list; struct ip_mc_socklist *mc_list;

1
net/ipv4/af_inet.c
View file

@ -375,6 +375,7 @@ lookup_protocol:
inet->uc_ttl = -1; inet->uc_ttl = -1;
inet->mc_loop = 1; inet->mc_loop = 1;
inet->mc_ttl = 1; inet->mc_ttl = 1;
inet->mc_all = 1;
inet->mc_index = 0; inet->mc_index = 0;
inet->mc_list = NULL; inet->mc_list = NULL;

2
net/ipv4/igmp.c
View file

@ -2196,7 +2196,7 @@ int ip_mc_sf_allow(struct sock *sk, __be32 loc_addr, __be32 rmt_addr, int dif)
break; break;
} }
if (!pmc) if (!pmc)
return 1; return inet->mc_all;
psl = pmc->sflist; psl = pmc->sflist;
if (!psl) if (!psl)
return pmc->sfmode == MCAST_EXCLUDE; return pmc->sfmode == MCAST_EXCLUDE;

11
net/ipv4/ip_sockglue.c
View file

@ -453,6 +453,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
(1<<IP_ROUTER_ALERT) | (1<<IP_FREEBIND) | (1<<IP_ROUTER_ALERT) | (1<<IP_FREEBIND) |
(1<<IP_PASSSEC) | (1<<IP_TRANSPARENT))) || (1<<IP_PASSSEC) | (1<<IP_TRANSPARENT))) ||
optname == IP_MULTICAST_TTL || optname == IP_MULTICAST_TTL ||
optname == IP_MULTICAST_ALL ||
optname == IP_MULTICAST_LOOP || optname == IP_MULTICAST_LOOP ||
optname == IP_RECVORIGDSTADDR) { optname == IP_RECVORIGDSTADDR) {
if (optlen >= sizeof(int)) { if (optlen >= sizeof(int)) {
@ -898,6 +899,13 @@ mc_msf_out:
kfree(gsf); kfree(gsf);
break; break;
} }
case IP_MULTICAST_ALL:
if (optlen < 1)
goto e_inval;
if (val != 0 && val != 1)
goto e_inval;
inet->mc_all = val;
break;
case IP_ROUTER_ALERT: case IP_ROUTER_ALERT:
err = ip_ra_control(sk, val ? 1 : 0, NULL); err = ip_ra_control(sk, val ? 1 : 0, NULL);
break; break;
@ -1151,6 +1159,9 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
release_sock(sk); release_sock(sk);
return err; return err;
} }
case IP_MULTICAST_ALL:
val = inet->mc_all;
break;
case IP_PKTOPTIONS: case IP_PKTOPTIONS:
{ {
struct msghdr msg; struct msghdr msg;