Network namespace support for PIM-SM (IPv4)
Subsystems (3)
PATCH 1/1 Network namespace support for PIM-SM (IPv4)
Here are some minor changes to enable using IPv4 PIM-SM with network namespaces:
- make PIM register vifs netns local
- set the netns when a PIM register vif is created
- make PIM available in all network namespaces (if CONFIG_IP_PIMSM_V2) by adding the protocol handler when multicast routing is initialized
Signed-off-by Tom Goff <[email protected]>
--- net/ipv4/ipmr.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
net/ipv4/ipmr.c +12 -12
@@ -226,9 +226,10 @@ static void reg_vif_setup(struct net_device *dev) dev->flags =IFF_NOARP ; dev->netdev_ops = ®_vif_netdev_ops, dev->destructor = free_netdev; + dev->features |=NETIF_F_NETNS_LOCAL ; } -static struct net_device *ipmr_reg_vif (void ) +static struct net_device *ipmr_reg_vif (struct net *net) {struct net_device *dev;struct in_device *in_dev;
@@ -238,6 +239,8 @@ static struct net_device *ipmr_reg_vif(void)if (dev ==NULL )return NULL ; +dev_net_set (dev, net); +if (register_netdevice (dev)) {free_netdev (dev);return NULL ;
@@ -448,7 +451,7 @@ static int vif_add(struct net *net, struct vifctl *vifc, int mrtsock)*/ if (net->ipv4.mroute_reg_vif_num >=0 )return -EADDRINUSE ; - dev =ipmr_reg_vif (); + dev =ipmr_reg_vif (net);if (!dev)return -ENOBUFS ; err =dev_set_allmulti (dev,1 );
@@ -1031,16 +1034,6 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, intif (v != net->ipv4.mroute_do_pim) { net->ipv4.mroute_do_pim = v; net->ipv4.mroute_do_assert = v; -#ifdef CONFIG_IP_PIMSM_V2 -if (net->ipv4.mroute_do_pim) - ret =inet_add_protocol (&pim_protocol, -IPPROTO_PIM ); -else - ret =inet_del_protocol (&pim_protocol, -IPPROTO_PIM ); -if (ret <0 ) - ret = -EAGAIN ; -#endif }rtnl_unlock ();return ret;
@@ -1955,6 +1948,7 @@ static const struct file_operations ipmr_mfc_fops = {#ifdef CONFIG_IP_PIMSM_V2 static struct net_protocol pim_protocol = { .handler = pim_rcv, + .netns_ok =1 , };#endif
@@ -2039,6 +2033,12 @@ int __init ip_mr_init(void)setup_timer (&ipmr_expire_timer, ipmr_expire_process,0 ); err =register_netdevice_notifier (&ip_mr_notifier); +#ifdef CONFIG_IP_PIMSM_V2 +if (inet_add_protocol (&pim_protocol,IPPROTO_PIM ) <0 ) { +printk (KERN_ERR "ip_mr_init: can't add PIM protocol\n" ); + err = -EAGAIN ; + } +#endif if (err) goto reg_notif_fail;return 0 ;
Signature · 1 line
1.6.0.6