[PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[Ville Nuorvala]

Hello Yoshifuji-san,

this (rewritten) patch configures link-local addresses to the ip6-ip6
tunnel devices so you can run link-local protocols over them. If you are
ok with the patch, perhaps we could push it forward to Dave.

Thanks,
Ville

===== net/ipv6/addrconf.c 1.74 vs edited =====
--- 1.74/net/ipv6/addrconf.c	Tue Oct 28 13:10:47 2003
+++ edited/net/ipv6/addrconf.c	Wed Nov  5 14:50:29 2003
@@ -1818,6 +1818,58 @@
 		sit_route_add(dev);
 }

+#if defined(CONFIG_IPV6_TUNNEL) || defined(CONFIG_IPV6_TUNNEL_MODULE)
+
+static inline int
+ip6_tnl_inherit_linklocal(struct inet6_dev *idev, struct net_device *link_dev)
+{
+	struct in6_addr lladdr;
+
+	if (!ipv6_get_lladdr(link_dev, &lladdr)) {
+		addrconf_add_linklocal(idev, &lladdr);
+		return 0;
+	}
+	return -1;
+}
+
+static void ip6_tnl_add_linklocal(struct inet6_dev *idev)
+{
+	struct net_device *link_dev;
+
+	/* first try to inherit the link-local address from the link device */
+	if (idev->dev->iflink &&
+	    (link_dev = __dev_get_by_index(idev->dev->iflink))) {
+		if (!ip6_tnl_inherit_linklocal(idev, link_dev))
+			return;
+	}
+	/* then try to inherit it from any device */
+	for (link_dev = dev_base; link_dev; link_dev = link_dev->next) {
+		if (!ip6_tnl_inherit_linklocal(idev, link_dev))
+			return;
+	}
+	printk(KERN_DEBUG "init ip6-ip6: add_linklocal failed\n");
+}
+
+/*
+ * Autoconfigure tunnel with a link-local address so routing protocols,
+ * DHCPv6, MLD etc. can be run over the virtual link
+ */
+
+static void addrconf_ip6_tnl_config(struct net_device *dev)
+{
+	struct inet6_dev *idev;
+
+	ASSERT_RTNL();
+
+	if ((idev = addrconf_add_dev(dev)) == NULL) {
+		printk(KERN_DEBUG "init ip6-ip6: add_dev failed\n");
+		return;
+	}
+	ip6_tnl_add_linklocal(idev);
+	addrconf_add_mroute(dev);
+}
+#endif
+

 int addrconf_notify(struct notifier_block *this, unsigned long event,
 		    void * data)
@@ -1831,7 +1883,11 @@
 		case ARPHRD_SIT:
 			addrconf_sit_config(dev);
 			break;
-
+#if defined(CONFIG_IPV6_TUNNEL) || defined(CONFIG_IPV6_TUNNEL_MODULE)
+		case ARPHRD_TUNNEL6:
+			addrconf_ip6_tnl_config(dev);
+			break;
+#endif
 		case ARPHRD_LOOPBACK:
 			init_loopback(dev);
 			break;
===== net/ipv6/ip6_tunnel.c 1.14 vs edited =====
--- 1.14/net/ipv6/ip6_tunnel.c	Wed Nov  5 10:11:00 2003
+++ edited/net/ipv6/ip6_tunnel.c	Wed Nov  5 14:58:27 2003
@@ -821,6 +821,8 @@
 	else
 		dev->flags &= ~IFF_POINTOPOINT;

+	dev->iflink = p->link;
+
 	if (p->flags & IP6_TNL_F_CAP_XMIT) {
 		struct rt6_info *rt = rt6_lookup(&p->raddr, &p->laddr,
 						 p->link, 0);
@@ -829,8 +831,6 @@
 			return;

 		if (rt->rt6i_dev) {
-			dev->iflink = rt->rt6i_dev->ifindex;
-
 			dev->hard_header_len = rt->rt6i_dev->hard_header_len +
 				sizeof (struct ipv6hdr);

@@ -1040,7 +1040,6 @@
 	dev->hard_header_len = LL_MAX_HEADER + sizeof (struct ipv6hdr);
 	dev->mtu = ETH_DATA_LEN - sizeof (struct ipv6hdr);
 	dev->flags |= IFF_NOARP;
-	dev->iflink = 0;
 	dev->addr_len = sizeof(struct in6_addr);
 }

--
Ville Nuorvala
Research Assistant, Institute of Digital Communications,
Helsinki University of Technology
email: vnuorval@tcs.hut.fi, phone: +358 (0)9 451 5257

Re: [PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[David S. Miller]

On Wed, 5 Nov 2003 15:07:32 +0200 (EET)
Ville Nuorvala <vnuorval@tcs.hut.fi> wrote:

> If you are ok with the patch, perhaps we could push it forward to Dave.

When a decision is made about this patch, just let me know.

Thanks.

Re: [PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[YOSHIFUJI Hideaki / 吉藤英明]

In article <Pine.LNX.4.58.0311051412180.28216@rhea.tcs.hut.fi> (at Wed, 5 Nov 2003 15:07:32 +0200 (EET)), Ville Nuorvala <vnuorval@tcs.hut.fi> says:

> this (rewritten) patch configures link-local addresses to the ip6-ip6
> tunnel devices so you can run link-local protocols over them. If you are
> ok with the patch, perhaps we could push it forward to Dave.

Sorry for long silence.

> +static inline int
> +ip6_tnl_inherit_linklocal(struct inet6_dev *idev, struct net_device *link_dev)
> +{
> +	struct in6_addr lladdr;
> +
> +	if (!ipv6_get_lladdr(link_dev, &lladdr)) {
> +		addrconf_add_linklocal(idev, &lladdr);
> +		return 0;
> +	}
> +	return -1;
> +}
> +

I prefer ipv6_inherit_linklocal() or something like that
because this does not seem ip6_tun specific.

I'm ok with other portion.

Thanks.

--yoshfuji

Re: [PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[Ville Nuorvala]

On Tue, 25 Nov 2003, YOSHIFUJI Hideaki / [iso-2022-jp] µÈÆ£±ÑÌÀ wrote:


> I prefer ipv6_inherit_linklocal() or something like that
> because this does not seem ip6_tun specific.
>
> I'm ok with other portion.
>
> Thanks.
>
> --yoshfuji

Ok,

here is a new version. I made some other minor changes to it too.

I removed the CONFIG_IPV6_TUNNEL ifdefs, so you don't need to recompile
the whole ipv6 stack and reboot just because you decide to compile
ip6_tunnel.c later as a module.

I also added the check for ifp->idev->cnf.rtr_solicits > 0 so you don't
send any Router Solicitations if rtr_solicits is zero. This way we avoid
sending tunneled RS messages (which will result in ICMPv6 destination
unreachable errors if the other end-point isn't set up yet) by setting
ipv6_devconf_dflt.rtr_solicits to zero before setting up the tunnel link.

Are you ok with these changes?

Regards,
Ville

===== net/ipv6/ip6_tunnel.c 1.12.1.2 vs 1.16 =====
--- 1.12.1.2/net/ipv6/ip6_tunnel.c	Wed Nov  5 22:36:56 2003
+++ 1.16/net/ipv6/ip6_tunnel.c	Thu Nov  6 17:00:52 2003
@@ -821,6 +821,8 @@
 	else
 		dev->flags &= ~IFF_POINTOPOINT;

+	dev->iflink = p->link;
+
 	if (p->flags & IP6_TNL_F_CAP_XMIT) {
 		struct rt6_info *rt = rt6_lookup(&p->raddr, &p->laddr,
 						 p->link, 0);
@@ -829,8 +831,6 @@
 			return;

 		if (rt->rt6i_dev) {
-			dev->iflink = rt->rt6i_dev->ifindex;
-
 			dev->hard_header_len = rt->rt6i_dev->hard_header_len +
 				sizeof (struct ipv6hdr);

@@ -1040,7 +1040,6 @@
 	dev->hard_header_len = LL_MAX_HEADER + sizeof (struct ipv6hdr);
 	dev->mtu = ETH_DATA_LEN - sizeof (struct ipv6hdr);
 	dev->flags |= IFF_NOARP;
-	dev->iflink = 0;
 	dev->addr_len = sizeof(struct in6_addr);
 }

===== net/ipv6/addrconf.c 1.74.1.3 vs 1.79 =====
--- 1.74.1.3/net/ipv6/addrconf.c	Wed Nov 26 03:06:32 2003
+++ 1.79/net/ipv6/addrconf.c	Thu Nov 27 11:14:09 2003
@@ -1809,6 +1809,54 @@
 		sit_route_add(dev);
 }

+static inline int
+ipv6_inherit_linklocal(struct inet6_dev *idev, struct net_device *link_dev)
+{
+	struct in6_addr lladdr;
+
+	if (!ipv6_get_lladdr(link_dev, &lladdr)) {
+		addrconf_add_linklocal(idev, &lladdr);
+		return 0;
+	}
+	return -1;
+}
+
+static void ip6_tnl_add_linklocal(struct inet6_dev *idev)
+{
+	struct net_device *link_dev;
+
+	/* first try to inherit the link-local address from the link device */
+	if (idev->dev->iflink &&
+	    (link_dev = __dev_get_by_index(idev->dev->iflink))) {
+		if (!ipv6_inherit_linklocal(idev, link_dev))
+			return;
+	}
+	/* then try to inherit it from any device */
+	for (link_dev = dev_base; link_dev; link_dev = link_dev->next) {
+		if (!ipv6_inherit_linklocal(idev, link_dev))
+			return;
+	}
+	printk(KERN_DEBUG "init ip6-ip6: add_linklocal failed\n");
+}
+
+/*
+ * Autoconfigure tunnel with a link-local address so routing protocols,
+ * DHCPv6, MLD etc. can be run over the virtual link
+ */
+
+static void addrconf_ip6_tnl_config(struct net_device *dev)
+{
+	struct inet6_dev *idev;
+
+	ASSERT_RTNL();
+
+	if ((idev = addrconf_add_dev(dev)) == NULL) {
+		printk(KERN_DEBUG "init ip6-ip6: add_dev failed\n");
+		return;
+	}
+	ip6_tnl_add_linklocal(idev);
+	addrconf_add_mroute(dev);
+}

 int addrconf_notify(struct notifier_block *this, unsigned long event,
 		    void * data)
@@ -1822,7 +1870,9 @@
 		case ARPHRD_SIT:
 			addrconf_sit_config(dev);
 			break;
-
+		case ARPHRD_TUNNEL6:
+			addrconf_ip6_tnl_config(dev);
+			break;
 		case ARPHRD_LOOPBACK:
 			init_loopback(dev);
 			break;
@@ -2121,6 +2171,7 @@
 	 */

 	if (ifp->idev->cnf.forwarding == 0 &&
+	    ifp->idev->cnf.rtr_solicits > 0 &&
 	    (dev->flags&IFF_LOOPBACK) == 0 &&
 	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
 		struct in6_addr all_routers;

--
Ville Nuorvala
Research Assistant, Institute of Digital Communications,
Helsinki University of Technology
email: vnuorval@tcs.hut.fi, phone: +358 (0)9 451 5257

Re: [PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[YOSHIFUJI Hideaki / 吉藤英明]

In article <Pine.LNX.4.58.0311271147250.3257@rhea.tcs.hut.fi> (at Thu, 27 Nov 2003 12:31:58 +0200 (EET)), Ville Nuorvala <vnuorval@tcs.hut.fi> says:

> here is a new version. I made some other minor changes to it too.

looks fine.
--yoshfuji

Re: [PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[Ville Nuorvala]

On Thu, 27 Nov 2003, YOSHIFUJI Hideaki / [iso-2022-jp] µÈÆ£±ÑÌÀ wrote:

> In article <Pine.LNX.4.58.0311271147250.3257@rhea.tcs.hut.fi> (at Thu, 27 Nov 2003 12:31:58 +0200 (EET)), Ville Nuorvala <vnuorval@tcs.hut.fi> says:
>
> > here is a new version. I made some other minor changes to it too.
>
> looks fine.
> --yoshfuji

Hi Dave, Yoshifuji-san is now ok with this patch :) Would you apply it?

Its purpose is to enable autoconfiguration of link-local addresses on
the ip6-ip6 tunnel devices.

Thanks,
Ville

===== net/ipv6/ip6_tunnel.c 1.12.1.2 vs 1.16 =====
--- 1.12.1.2/net/ipv6/ip6_tunnel.c	Wed Nov  5 22:36:56 2003
+++ 1.16/net/ipv6/ip6_tunnel.c	Thu Nov  6 17:00:52 2003
@@ -821,6 +821,8 @@
 	else
 		dev->flags &= ~IFF_POINTOPOINT;

+	dev->iflink = p->link;
+
 	if (p->flags & IP6_TNL_F_CAP_XMIT) {
 		struct rt6_info *rt = rt6_lookup(&p->raddr, &p->laddr,
 						 p->link, 0);
@@ -829,8 +831,6 @@
 			return;

 		if (rt->rt6i_dev) {
-			dev->iflink = rt->rt6i_dev->ifindex;
-
 			dev->hard_header_len = rt->rt6i_dev->hard_header_len +
 				sizeof (struct ipv6hdr);

@@ -1040,7 +1040,6 @@
 	dev->hard_header_len = LL_MAX_HEADER + sizeof (struct ipv6hdr);
 	dev->mtu = ETH_DATA_LEN - sizeof (struct ipv6hdr);
 	dev->flags |= IFF_NOARP;
-	dev->iflink = 0;
 	dev->addr_len = sizeof(struct in6_addr);
 }

===== net/ipv6/addrconf.c 1.74.1.3 vs 1.79 =====
--- 1.74.1.3/net/ipv6/addrconf.c	Wed Nov 26 03:06:32 2003
+++ 1.79/net/ipv6/addrconf.c	Thu Nov 27 11:14:09 2003
@@ -1809,6 +1809,54 @@
 		sit_route_add(dev);
 }

+static inline int
+ipv6_inherit_linklocal(struct inet6_dev *idev, struct net_device *link_dev)
+{
+	struct in6_addr lladdr;
+
+	if (!ipv6_get_lladdr(link_dev, &lladdr)) {
+		addrconf_add_linklocal(idev, &lladdr);
+		return 0;
+	}
+	return -1;
+}
+
+static void ip6_tnl_add_linklocal(struct inet6_dev *idev)
+{
+	struct net_device *link_dev;
+
+	/* first try to inherit the link-local address from the link device */
+	if (idev->dev->iflink &&
+	    (link_dev = __dev_get_by_index(idev->dev->iflink))) {
+		if (!ipv6_inherit_linklocal(idev, link_dev))
+			return;
+	}
+	/* then try to inherit it from any device */
+	for (link_dev = dev_base; link_dev; link_dev = link_dev->next) {
+		if (!ipv6_inherit_linklocal(idev, link_dev))
+			return;
+	}
+	printk(KERN_DEBUG "init ip6-ip6: add_linklocal failed\n");
+}
+
+/*
+ * Autoconfigure tunnel with a link-local address so routing protocols,
+ * DHCPv6, MLD etc. can be run over the virtual link
+ */
+
+static void addrconf_ip6_tnl_config(struct net_device *dev)
+{
+	struct inet6_dev *idev;
+
+	ASSERT_RTNL();
+
+	if ((idev = addrconf_add_dev(dev)) == NULL) {
+		printk(KERN_DEBUG "init ip6-ip6: add_dev failed\n");
+		return;
+	}
+	ip6_tnl_add_linklocal(idev);
+	addrconf_add_mroute(dev);
+}

 int addrconf_notify(struct notifier_block *this, unsigned long event,
 		    void * data)
@@ -1822,7 +1870,9 @@
 		case ARPHRD_SIT:
 			addrconf_sit_config(dev);
 			break;
-
+		case ARPHRD_TUNNEL6:
+			addrconf_ip6_tnl_config(dev);
+			break;
 		case ARPHRD_LOOPBACK:
 			init_loopback(dev);
 			break;
@@ -2121,6 +2171,7 @@
 	 */

 	if (ifp->idev->cnf.forwarding == 0 &&
+	    ifp->idev->cnf.rtr_solicits > 0 &&
 	    (dev->flags&IFF_LOOPBACK) == 0 &&
 	    (ipv6_addr_type(&ifp->addr) & IPV6_ADDR_LINKLOCAL)) {
 		struct in6_addr all_routers;

--
Ville Nuorvala
Research Assistant, Institute of Digital Communications,
Helsinki University of Technology
email: vnuorval@tcs.hut.fi, phone: +358 (0)9 451 5257

Re: [PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[David S. Miller]

On Fri, 28 Nov 2003 12:34:12 +0200 (EET)
Ville Nuorvala <vnuorval@tcs.hut.fi> wrote:

> Hi Dave, Yoshifuji-san is now ok with this patch :) Would you apply it?
> 
> Its purpose is to enable autoconfiguration of link-local addresses on
> the ip6-ip6 tunnel devices.

I will, just that I'm in no rush to do this since Linus won't look
at anything until at least next week. :)

Re: [PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[David S. Miller]

On Fri, 28 Nov 2003 12:34:12 +0200 (EET)
Ville Nuorvala <vnuorval@tcs.hut.fi> wrote:

> On Thu, 27 Nov 2003, YOSHIFUJI Hideaki / [iso-2022-jp] µÈÆ£±ÑÌÀ wrote:
> 
> > In article <Pine.LNX.4.58.0311271147250.3257@rhea.tcs.hut.fi> (at Thu, 27 Nov 2003 12:31:58 +0200 (EET)), Ville Nuorvala <vnuorval@tcs.hut.fi> says:
> >
> > > here is a new version. I made some other minor changes to it too.
> >
> > looks fine.
> > --yoshfuji
> 
> Hi Dave, Yoshifuji-san is now ok with this patch :) Would you apply it?

I thought some more about this and I am realizing this is not
a pure bug fix, I am very sure Linus will not take the change.

We can hold onto this until 2.6.1, ok?

Re: [PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[Pekka Savola]

On Sat, 29 Nov 2003, David S. Miller wrote:
> > Hi Dave, Yoshifuji-san is now ok with this patch :) Would you apply it?
> 
> I thought some more about this and I am realizing this is not
> a pure bug fix, I am very sure Linus will not take the change.
> 
> We can hold onto this until 2.6.1, ok?

Another perspective:

Well, the specs say very strongly that all interfaces MUST have
lik-local addresses, so it's a pretty big bug,
implementation-of-the-spec -wise.

However, it's probably not a bug in the current code, though.

But I'm personally fine with waiting..

-- 
Pekka Savola                 "You each name yourselves king, yet the
Netcore Oy                    kingdom bleeds."
Systems. Networks. Security. -- George R.R. Martin: A Clash of Kings

Re: [PATCH] IPv6: Autoconfig link-local address on ip6-ip6 tunnel device

[Ville Nuorvala]

On Sat, 29 Nov 2003, David S. Miller wrote:

> I thought some more about this and I am realizing this is not
> a pure bug fix, I am very sure Linus will not take the change.
>
> We can hold onto this until 2.6.1, ok?

Yes that's fine.

--
Ville Nuorvala
Research Assistant, Institute of Digital Communications,
Helsinki University of Technology
email: vnuorval@tcs.hut.fi, phone: +358 (0)9 451 5257