Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 403dbb97 authored by Tom Goff's avatar Tom Goff Committed by David S. Miller
Browse files

PIM-SM: namespace changes 



IPv4:
  - 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

IPv6:
  - make PIM register vifs netns local
  - make PIM available in all network namespaces (if CONFIG_IPV6_PIMSM_V2)
    by adding the protocol handler when multicast routing is initialized

Signed-off-by: default avatarTom Goff <thomas.goff@boeing.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e61a4b63

net/ipv4/ipmr.c

+17 −12
Original line number Diff line number Diff line
@@ -226,9 +226,10 @@ static void reg_vif_setup(struct net_device *dev) 
	dev->flags		= IFF_NOARP;

	dev->netdev_ops		= &reg_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, int 
		if (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;
@@ -1954,6 +1947,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
@@ -2040,8 +2034,19 @@ int __init ip_mr_init(void) 
	err = register_netdevice_notifier(&ip_mr_notifier);

	if (err)

		goto reg_notif_fail;

#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;

		goto add_proto_fail;

	}

#endif

	return 0;



#ifdef CONFIG_IP_PIMSM_V2

add_proto_fail:

	unregister_netdevice_notifier(&ip_mr_notifier);

#endif

reg_notif_fail:

	del_timer(&ipmr_expire_timer);

	unregister_pernet_subsys(&ipmr_net_ops);

net/ipv6/ip6mr.c

+12 −8
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ static void reg_vif_setup(struct net_device *dev) 
	dev->flags		= IFF_NOARP;

	dev->netdev_ops		= &reg_vif_netdev_ops;

	dev->destructor		= free_netdev;

	dev->features		|= NETIF_F_NETNS_LOCAL;

}



static struct net_device *ip6mr_reg_vif(struct net *net)
@@ -1077,7 +1078,18 @@ int __init ip6_mr_init(void) 
	err = register_netdevice_notifier(&ip6_mr_notifier);

	if (err)

		goto reg_notif_fail;

#ifdef CONFIG_IPV6_PIMSM_V2

	if (inet6_add_protocol(&pim6_protocol, IPPROTO_PIM) < 0) {

		printk(KERN_ERR "ip6_mr_init: can't add PIM protocol\n");

		err = -EAGAIN;

		goto add_proto_fail;

	}

#endif

	return 0;

#ifdef CONFIG_IPV6_PIMSM_V2

add_proto_fail:

	unregister_netdevice_notifier(&ip6_mr_notifier);

#endif

reg_notif_fail:

	del_timer(&ipmr_expire_timer);

	unregister_pernet_subsys(&ip6mr_net_ops);
@@ -1363,14 +1375,6 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, int 
		if (v != net->ipv6.mroute_do_pim) {

			net->ipv6.mroute_do_pim = v;

			net->ipv6.mroute_do_assert = v;

			if (net->ipv6.mroute_do_pim)

				ret = inet6_add_protocol(&pim6_protocol,

							 IPPROTO_PIM);

			else

				ret = inet6_del_protocol(&pim6_protocol,

							 IPPROTO_PIM);

			if (ret < 0)

				ret = -EAGAIN;

		}

		rtnl_unlock();

		return ret;