6 files changed, 168 insertions, 116 deletions

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index e6f83b6a2b76..f8a107ab5592 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -88,7 +88,7 @@ config INET6_IPCOMP
         tristate "IPv6: IPComp transformation"
         depends on IPV6
         select XFRM
-        select INET6_TUNNEL
+        select INET6_XFRM_TUNNEL
         select CRYPTO
         select CRYPTO_DEFLATE
         ---help---
@@ -97,19 +97,18 @@ config INET6_IPCOMP
 
           If unsure, say Y.
 
+config INET6_XFRM_TUNNEL
+        tristate
+        select INET6_TUNNEL
+        default n
+
 config INET6_TUNNEL
-        tristate "IPv6: tunnel transformation"
-        depends on IPV6
-        select XFRM
-        ---help---
-          Support for generic IPv6-in-IPv6 tunnel transformation, which is
-          required by the IPv6-in-IPv6 tunneling module as well as tunnel mode
-          IPComp.
-          
-          If unsure, say Y.
+        tristate
+        default n
 
 config IPV6_TUNNEL
         tristate "IPv6: IPv6-in-IPv6 tunnel"
+        select INET6_TUNNEL
         depends on IPV6
         ---help---
           Support for IPv6-in-IPv6 tunnels described in RFC 2473.
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index 41877abd22e6..a760b0988fbb 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -18,7 +18,8 @@ ipv6-objs += $(ipv6-y)
 obj-$(CONFIG_INET6_AH) += ah6.o
 obj-$(CONFIG_INET6_ESP) += esp6.o
 obj-$(CONFIG_INET6_IPCOMP) += ipcomp6.o
-obj-$(CONFIG_INET6_TUNNEL) += xfrm6_tunnel.o 
+obj-$(CONFIG_INET6_XFRM_TUNNEL) += xfrm6_tunnel.o
+obj-$(CONFIG_INET6_TUNNEL) += tunnel6.o
 obj-$(CONFIG_NETFILTER) += netfilter/
 
 obj-$(CONFIG_IPV6_TUNNEL) += ip6_tunnel.o
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 48597538db3f..ff9040c92556 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -44,7 +44,6 @@
 
 #include <net/ip.h>
 #include <net/ipv6.h>
-#include <net/protocol.h>
 #include <net/ip6_route.h>
 #include <net/addrconf.h>
 #include <net/ip6_tunnel.h>
@@ -391,7 +390,7 @@ parse_tlv_tnl_enc_lim(struct sk_buff *skb, __u8 * raw)
  *   to the specifications in RFC 2473.
  **/
 
-static void 
+static int
 ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
            int type, int code, int offset, __u32 info)
 {
@@ -402,6 +401,7 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         int rel_code = ICMPV6_ADDR_UNREACH;
         __u32 rel_info = 0;
         __u16 len;
+        int err = -ENOENT;
 
         /* If the packet doesn't contain the original IPv6 header we are 
            in trouble since we might need the source address for further 
@@ -411,6 +411,8 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         if ((t = ip6ip6_tnl_lookup(&ipv6h->daddr, &ipv6h->saddr)) == NULL)
                 goto out;
 
+        err = 0;
+
         switch (type) {
                 __u32 teli;
                 struct ipv6_tlv_tnl_enc_lim *tel;
@@ -492,6 +494,7 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         }
 out:
         read_unlock(&ip6ip6_lock);
+        return err;
 }
 
 static inline void ip6ip6_ecn_decapsulate(struct ipv6hdr *outer_iph,
@@ -511,9 +514,8 @@ static inline void ip6ip6_ecn_decapsulate(struct ipv6hdr *outer_iph,
  **/
 
 static int 
-ip6ip6_rcv(struct sk_buff **pskb)
+ip6ip6_rcv(struct sk_buff *skb)
 {
-        struct sk_buff *skb = *pskb;
         struct ipv6hdr *ipv6h;
         struct ip6_tnl *t;
 
@@ -1112,39 +1114,12 @@ ip6ip6_fb_tnl_dev_init(struct net_device *dev)
         return 0;
 }
 
-#ifdef CONFIG_INET6_TUNNEL
 static struct xfrm6_tunnel ip6ip6_handler = {
         .handler        = ip6ip6_rcv,
         .err_handler    = ip6ip6_err,
+        .priority       =       1,
 };
 
-static inline int ip6ip6_register(void)
-{
-        return xfrm6_tunnel_register(&ip6ip6_handler);
-}
-
-static inline int ip6ip6_unregister(void)
-{
-        return xfrm6_tunnel_deregister(&ip6ip6_handler);
-}
-#else
-static struct inet6_protocol xfrm6_tunnel_protocol = {
-        .handler        = ip6ip6_rcv,
-        .err_handler    = ip6ip6_err,
-        .flags          = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
-};
-
-static inline int ip6ip6_register(void)
-{
-        return inet6_add_protocol(&xfrm6_tunnel_protocol, IPPROTO_IPV6);
-}
-
-static inline int ip6ip6_unregister(void)
-{
-        return inet6_del_protocol(&xfrm6_tunnel_protocol, IPPROTO_IPV6);
-}
-#endif
-
 /**
  * ip6_tunnel_init - register protocol and reserve needed resources
  *
@@ -1155,7 +1130,7 @@ static int __init ip6_tunnel_init(void)
 {
         int  err;
 
-        if (ip6ip6_register() < 0) {
+        if (xfrm6_tunnel_register(&ip6ip6_handler)) {
                 printk(KERN_ERR "ip6ip6 init: can't register tunnel\n");
                 return -EAGAIN;
         }
@@ -1174,7 +1149,7 @@ static int __init ip6_tunnel_init(void)
         }
         return 0;
 fail:
-        ip6ip6_unregister();
+        xfrm6_tunnel_deregister(&ip6ip6_handler);
         return err;
 }
 
@@ -1184,7 +1159,7 @@ fail:
 
 static void __exit ip6_tunnel_cleanup(void)
 {
-        if (ip6ip6_unregister() < 0)
+        if (xfrm6_tunnel_deregister(&ip6ip6_handler))
                 printk(KERN_INFO "ip6ip6 close: can't deregister tunnel\n");
 
         unregister_netdev(ip6ip6_fb_tnl_dev);
diff --git a/net/ipv6/tunnel6.c b/net/ipv6/tunnel6.c
new file mode 100644
index 000000000000..5659b52284bd
--- /dev/null
+++ b/net/ipv6/tunnel6.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C)2003,2004 USAGI/WIDE Project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors      Mitsuru KANDA  <mk@linux-ipv6.org>
+ *              YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <net/protocol.h>
+#include <net/xfrm.h>
+
+static struct xfrm6_tunnel *tunnel6_handlers;
+static DEFINE_MUTEX(tunnel6_mutex);
+
+int xfrm6_tunnel_register(struct xfrm6_tunnel *handler)
+{
+        struct xfrm6_tunnel **pprev;
+        int ret = -EEXIST;
+        int priority = handler->priority;
+
+        mutex_lock(&tunnel6_mutex);
+
+        for (pprev = &tunnel6_handlers; *pprev; pprev = &(*pprev)->next) {
+                if ((*pprev)->priority > priority)
+                        break;
+                if ((*pprev)->priority == priority)
+                        goto err;
+        }
+
+        handler->next = *pprev;
+        *pprev = handler;
+
+        ret = 0;
+
+err:
+        mutex_unlock(&tunnel6_mutex);
+
+        return ret;
+}
+
+EXPORT_SYMBOL(xfrm6_tunnel_register);
+
+int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler)
+{
+        struct xfrm6_tunnel **pprev;
+        int ret = -ENOENT;
+
+        mutex_lock(&tunnel6_mutex);
+
+        for (pprev = &tunnel6_handlers; *pprev; pprev = &(*pprev)->next) {
+                if (*pprev == handler) {
+                        *pprev = handler->next;
+                        ret = 0;
+                        break;
+                }
+        }
+
+        mutex_unlock(&tunnel6_mutex);
+
+        synchronize_net();
+
+        return ret;
+}
+
+EXPORT_SYMBOL(xfrm6_tunnel_deregister);
+
+static int tunnel6_rcv(struct sk_buff **pskb)
+{
+        struct sk_buff *skb = *pskb;
+        struct xfrm6_tunnel *handler;
+
+        for (handler = tunnel6_handlers; handler; handler = handler->next)
+                if (!handler->handler(skb))
+                        return 0;
+
+        kfree_skb(skb);
+        return 0;
+}
+
+static void tunnel6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+                        int type, int code, int offset, __u32 info)
+{
+        struct xfrm6_tunnel *handler;
+
+        for (handler = tunnel6_handlers; handler; handler = handler->next)
+                if (!handler->err_handler(skb, opt, type, code, offset, info))
+                        break;
+}
+
+static struct inet6_protocol tunnel6_protocol = {
+        .handler        = tunnel6_rcv,
+        .err_handler    = tunnel6_err,
+        .flags          = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
+};
+
+static int __init tunnel6_init(void)
+{
+        if (inet6_add_protocol(&tunnel6_protocol, IPPROTO_IPV6)) {
+                printk(KERN_ERR "tunnel6 init(): can't add protocol\n");
+                return -EAGAIN;
+        }
+        return 0;
+}
+
+static void __exit tunnel6_fini(void)
+{
+        if (inet6_del_protocol(&tunnel6_protocol, IPPROTO_IPV6))
+                printk(KERN_ERR "tunnel6 close: can't remove protocol\n");
+}
+
+module_init(tunnel6_init);
+module_exit(tunnel6_fini);
+MODULE_LICENSE("GPL");
diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index 1ca2da68ef69..cccf8b76f046 100644
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -28,9 +28,8 @@ static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)
                 IP6_ECN_set_ce(inner_iph);
 }
 
-int xfrm6_rcv_spi(struct sk_buff **pskb, u32 spi)
+int xfrm6_rcv_spi(struct sk_buff *skb, u32 spi)
 {
-        struct sk_buff *skb = *pskb;
         int err;
         u32 seq;
         struct sec_decap_state xfrm_vec[XFRM_MAX_DEPTH];
@@ -159,5 +158,5 @@ EXPORT_SYMBOL(xfrm6_rcv_spi);
 
 int xfrm6_rcv(struct sk_buff **pskb)
 {
-        return xfrm6_rcv_spi(pskb, 0);
+        return xfrm6_rcv_spi(*pskb, 0);
 }
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index 08f9abbdf1d7..a8f6776c518d 100644
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -28,7 +28,6 @@
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/ipv6.h>
-#include <net/protocol.h>
 #include <linux/ipv6.h>
 #include <linux/icmpv6.h>
 #include <linux/mutex.h>
@@ -357,71 +356,18 @@ static int xfrm6_tunnel_input(struct xfrm_state *x, struct xfrm_decap_state *dec
         return 0;
 }
 
-static struct xfrm6_tunnel *xfrm6_tunnel_handler;
-static DEFINE_MUTEX(xfrm6_tunnel_mutex);
-
-int xfrm6_tunnel_register(struct xfrm6_tunnel *handler)
+static int xfrm6_tunnel_rcv(struct sk_buff *skb)
 {
-        int ret;
-
-        mutex_lock(&xfrm6_tunnel_mutex);
-        ret = 0;
-        if (xfrm6_tunnel_handler != NULL)
-                ret = -EINVAL;
-        if (!ret)
-                xfrm6_tunnel_handler = handler;
-        mutex_unlock(&xfrm6_tunnel_mutex);
-
-        return ret;
-}
-
-EXPORT_SYMBOL(xfrm6_tunnel_register);
-
-int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler)
-{
-        int ret;
-
-        mutex_lock(&xfrm6_tunnel_mutex);
-        ret = 0;
-        if (xfrm6_tunnel_handler != handler)
-                ret = -EINVAL;
-        if (!ret)
-                xfrm6_tunnel_handler = NULL;
-        mutex_unlock(&xfrm6_tunnel_mutex);
-
-        synchronize_net();
-
-        return ret;
-}
-
-EXPORT_SYMBOL(xfrm6_tunnel_deregister);
-
-static int xfrm6_tunnel_rcv(struct sk_buff **pskb)
-{
-        struct sk_buff *skb = *pskb;
-        struct xfrm6_tunnel *handler = xfrm6_tunnel_handler;
         struct ipv6hdr *iph = skb->nh.ipv6h;
         u32 spi;
 
-        /* device-like_ip6ip6_handler() */
-        if (handler && handler->handler(pskb) == 0)
-                return 0;
-
         spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&iph->saddr);
-        return xfrm6_rcv_spi(pskb, spi);
+        return xfrm6_rcv_spi(skb, spi);
 }
 
-static void xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
-                             int type, int code, int offset, __u32 info)
+static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
+                            int type, int code, int offset, __u32 info)
 {
-        struct xfrm6_tunnel *handler = xfrm6_tunnel_handler;
-
-        /* call here first for device-like ip6ip6 err handling */
-        if (handler) {
-                handler->err_handler(skb, opt, type, code, offset, info);
-                return;
-        }
-
         /* xfrm6_tunnel native err handling */
         switch (type) {
         case ICMPV6_DEST_UNREACH: 
@@ -462,7 +408,8 @@ static void xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         default:
                 break;
         }
-        return;
+
+        return 0;
 }
 
 static int xfrm6_tunnel_init_state(struct xfrm_state *x)
@@ -493,10 +440,10 @@ static struct xfrm_type xfrm6_tunnel_type = {
         .output         = xfrm6_tunnel_output,
 };
 
-static struct inet6_protocol xfrm6_tunnel_protocol = {
+static struct xfrm6_tunnel xfrm6_tunnel_handler = {
         .handler        = xfrm6_tunnel_rcv,
-        .err_handler    = xfrm6_tunnel_err, 
-        .flags          = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
+        .err_handler    = xfrm6_tunnel_err,
+        .priority       = 2,
 };
 
 static int __init xfrm6_tunnel_init(void)
@@ -508,16 +455,16 @@ static int __init xfrm6_tunnel_init(void)
                            "xfrm6_tunnel init: can't add xfrm type\n");
                 return -EAGAIN;
         }
-        if (inet6_add_protocol(&xfrm6_tunnel_protocol, IPPROTO_IPV6) < 0) {
+        if (xfrm6_tunnel_register(&xfrm6_tunnel_handler)) {
                 X6TPRINTK1(KERN_ERR
-                           "xfrm6_tunnel init(): can't add protocol\n");
+                           "xfrm6_tunnel init(): can't add handler\n");
                 xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
                 return -EAGAIN;
         }
         if (xfrm6_tunnel_spi_init() < 0) {
                 X6TPRINTK1(KERN_ERR
                            "xfrm6_tunnel init: failed to initialize spi\n");
-                inet6_del_protocol(&xfrm6_tunnel_protocol, IPPROTO_IPV6);
+                xfrm6_tunnel_deregister(&xfrm6_tunnel_handler);
                 xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
                 return -EAGAIN;
         }
@@ -529,9 +476,9 @@ static void __exit xfrm6_tunnel_fini(void)
         X6TPRINTK3(KERN_DEBUG "%s()\n", __FUNCTION__);
 
         xfrm6_tunnel_spi_fini();
-        if (inet6_del_protocol(&xfrm6_tunnel_protocol, IPPROTO_IPV6) < 0)
+        if (xfrm6_tunnel_deregister(&xfrm6_tunnel_handler))
                 X6TPRINTK1(KERN_ERR 
-                           "xfrm6_tunnel close: can't remove protocol\n");
+                           "xfrm6_tunnel close: can't remove handler\n");
         if (xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6) < 0)
                 X6TPRINTK1(KERN_ERR
                            "xfrm6_tunnel close: can't remove xfrm type\n");