1 files changed, 86 insertions, 11 deletions

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 664ab82e03b2..b3a59bd40f01 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -15,6 +15,7 @@
  * Roger Venning <r.venning@telstra.com>:       6to4 support
  * Nate Thompson <nate@thebog.net>:             6to4 support
  * Fred Templin <fred.l.templin@boeing.com>:    isatap support
+ * Sascha Hlusiak <mail@saschahlusiak.de>:      stateless autoconf for isatap
  */
 
 #include <linux/module.h>
@@ -80,7 +81,7 @@ struct sit_net {
 static DEFINE_RWLOCK(ipip6_lock);
 
 static struct ip_tunnel * ipip6_tunnel_lookup(struct net *net,
-                __be32 remote, __be32 local)
+                struct net_device *dev, __be32 remote, __be32 local)
 {
         unsigned h0 = HASH(remote);
         unsigned h1 = HASH(local);
@@ -89,18 +90,25 @@ static struct ip_tunnel * ipip6_tunnel_lookup(struct net *net,
 
         for (t = sitn->tunnels_r_l[h0^h1]; t; t = t->next) {
                 if (local == t->parms.iph.saddr &&
-                    remote == t->parms.iph.daddr && (t->dev->flags&IFF_UP))
+                    remote == t->parms.iph.daddr &&
+                    (!dev || !t->parms.link || dev->iflink == t->parms.link) &&
+                    (t->dev->flags & IFF_UP))
                         return t;
         }
         for (t = sitn->tunnels_r[h0]; t; t = t->next) {
-                if (remote == t->parms.iph.daddr && (t->dev->flags&IFF_UP))
+                if (remote == t->parms.iph.daddr &&
+                    (!dev || !t->parms.link || dev->iflink == t->parms.link) &&
+                    (t->dev->flags & IFF_UP))
                         return t;
         }
         for (t = sitn->tunnels_l[h1]; t; t = t->next) {
-                if (local == t->parms.iph.saddr && (t->dev->flags&IFF_UP))
+                if (local == t->parms.iph.saddr &&
+                    (!dev || !t->parms.link || dev->iflink == t->parms.link) &&
+                    (t->dev->flags & IFF_UP))
                         return t;
         }
-        if ((t = sitn->tunnels_wc[0]) != NULL && (t->dev->flags&IFF_UP))
+        t = sitn->tunnels_wc[0];
+        if ((t != NULL) && (t->dev->flags & IFF_UP))
                 return t;
         return NULL;
 }
@@ -165,8 +173,14 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct net *net,
         struct sit_net *sitn = net_generic(net, sit_net_id);
 
         for (tp = __ipip6_bucket(sitn, parms); (t = *tp) != NULL; tp = &t->next) {
-                if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr)
-                        return t;
+                if (local == t->parms.iph.saddr &&
+                    remote == t->parms.iph.daddr &&
+                    parms->link == t->parms.link) {
+                        if (create)
+                                return NULL;
+                        else
+                                return t;
+                }
         }
         if (!create)
                 goto failed;
@@ -209,6 +223,44 @@ failed:
         return NULL;
 }
 
+static void ipip6_tunnel_rs_timer(unsigned long data)
+{
+        struct ip_tunnel_prl_entry *p = (struct ip_tunnel_prl_entry *) data;
+        struct inet6_dev *ifp;
+        struct inet6_ifaddr *addr;
+
+        spin_lock(&p->lock);
+        ifp = __in6_dev_get(p->tunnel->dev);
+
+        read_lock_bh(&ifp->lock);
+        for (addr = ifp->addr_list; addr; addr = addr->if_next) {
+                struct in6_addr rtr;
+
+                if (!(ipv6_addr_type(&addr->addr) & IPV6_ADDR_LINKLOCAL))
+                        continue;
+
+                /* Send RS to guessed linklocal address of router
+                 *
+                 * Better: send to ff02::2 encapsuled in unicast directly
+                 * to router-v4 instead of guessing the v6 address.
+                 *
+                 * Cisco/Windows seem to not set the u/l bit correctly,
+                 * so we won't guess right.
+                 */
+                ipv6_addr_set(&rtr,  htonl(0xFE800000), 0, 0, 0);
+                if (!__ipv6_isatap_ifid(rtr.s6_addr + 8,
+                                        p->addr)) {
+                        ndisc_send_rs(p->tunnel->dev, &addr->addr, &rtr);
+                }
+        }
+        read_unlock_bh(&ifp->lock);
+
+        mod_timer(&p->rs_timer, jiffies + HZ * p->rs_delay);
+        spin_unlock(&p->lock);
+
+        return;
+}
+
 static struct ip_tunnel_prl_entry *
 __ipip6_tunnel_locate_prl(struct ip_tunnel *t, __be32 addr)
 {
@@ -267,6 +319,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
                         continue;
                 kp[c].addr = prl->addr;
                 kp[c].flags = prl->flags;
+                kp[c].rs_delay = prl->rs_delay;
                 c++;
                 if (kprl.addr != htonl(INADDR_ANY))
                         break;
@@ -316,11 +369,23 @@ ipip6_tunnel_add_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a, int chg)
         }
 
         p->next = t->prl;
+        p->tunnel = t;
         t->prl = p;
         t->prl_count++;
+
+        spin_lock_init(&p->lock);
+        setup_timer(&p->rs_timer, ipip6_tunnel_rs_timer, (unsigned long) p);
 update:
         p->addr = a->addr;
         p->flags = a->flags;
+        p->rs_delay = a->rs_delay;
+        if (p->rs_delay == 0)
+                p->rs_delay = IPTUNNEL_RS_DEFAULT_DELAY;
+        spin_lock(&p->lock);
+        del_timer(&p->rs_timer);
+        if (p->flags & PRL_DEFAULT)
+                mod_timer(&p->rs_timer, jiffies + 1);
+        spin_unlock(&p->lock);
 out:
         write_unlock(&ipip6_lock);
         return err;
@@ -339,6 +404,9 @@ ipip6_tunnel_del_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a)
                         if ((*p)->addr == a->addr) {
                                 x = *p;
                                 *p = x->next;
+                                spin_lock(&x->lock);
+                                del_timer(&x->rs_timer);
+                                spin_unlock(&x->lock);
                                 kfree(x);
                                 t->prl_count--;
                                 goto out;
@@ -349,13 +417,16 @@ ipip6_tunnel_del_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a)
                 while (t->prl) {
                         x = t->prl;
                         t->prl = t->prl->next;
+                        spin_lock(&x->lock);
+                        del_timer(&x->rs_timer);
+                        spin_unlock(&x->lock);
                         kfree(x);
                         t->prl_count--;
                 }
         }
 out:
         write_unlock(&ipip6_lock);
-        return 0;
+        return err;
 }
 
 static int
@@ -446,7 +517,10 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
         err = -ENOENT;
 
         read_lock(&ipip6_lock);
-        t = ipip6_tunnel_lookup(dev_net(skb->dev), iph->daddr, iph->saddr);
+        t = ipip6_tunnel_lookup(dev_net(skb->dev),
+                                skb->dev,
+                                iph->daddr,
+                                iph->saddr);
         if (t == NULL || t->parms.iph.daddr == 0)
                 goto out;
 
@@ -481,8 +555,9 @@ static int ipip6_rcv(struct sk_buff *skb)
         iph = ip_hdr(skb);
 
         read_lock(&ipip6_lock);
-        if ((tunnel = ipip6_tunnel_lookup(dev_net(skb->dev),
-                                        iph->saddr, iph->daddr)) != NULL) {
+        tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev,
+                                     iph->saddr, iph->daddr);
+        if (tunnel != NULL) {
                 secpath_reset(skb);
                 skb->mac_header = skb->network_header;
                 skb_reset_network_header(skb);