ipv6: When we droped a packet, we should return NET_RX_DROP instead of 0
[linux-2.6.git] / net / ipv6 / xfrm6_tunnel.c
index 12e426b..c2b2781 100644 (file)
@@ -5,12 +5,12 @@
  * 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
@@ -32,7 +32,7 @@
 #include <linux/mutex.h>
 
 /*
- * xfrm_tunnel_spi things are for allocating unique id ("spi") 
+ * xfrm_tunnel_spi things are for allocating unique id ("spi")
  * per xfrm_address_t.
  */
 struct xfrm6_tunnel_spi {
@@ -58,7 +58,7 @@ static struct kmem_cache *xfrm6_tunnel_spi_kmem __read_mostly;
 static struct hlist_head xfrm6_tunnel_spi_byaddr[XFRM6_TUNNEL_SPI_BYADDR_HSIZE];
 static struct hlist_head xfrm6_tunnel_spi_byspi[XFRM6_TUNNEL_SPI_BYSPI_HSIZE];
 
-static unsigned inline xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr)
+static inline unsigned xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr)
 {
        unsigned h;
 
@@ -70,7 +70,7 @@ static unsigned inline xfrm6_tunnel_spi_hash_byaddr(xfrm_address_t *addr)
        return h;
 }
 
-static unsigned inline xfrm6_tunnel_spi_hash_byspi(u32 spi)
+static inline unsigned xfrm6_tunnel_spi_hash_byspi(u32 spi)
 {
        return spi % XFRM6_TUNNEL_SPI_BYSPI_HSIZE;
 }
@@ -84,7 +84,7 @@ static int xfrm6_tunnel_spi_init(void)
        xfrm6_tunnel_spi_kmem = kmem_cache_create("xfrm6_tunnel_spi",
                                                  sizeof(struct xfrm6_tunnel_spi),
                                                  0, SLAB_HWCACHE_ALIGN,
-                                                 NULL, NULL);
+                                                 NULL);
        if (!xfrm6_tunnel_spi_kmem)
                return -ENOMEM;
 
@@ -140,12 +140,26 @@ __be32 xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr)
 
 EXPORT_SYMBOL(xfrm6_tunnel_spi_lookup);
 
+static int __xfrm6_tunnel_spi_check(u32 spi)
+{
+       struct xfrm6_tunnel_spi *x6spi;
+       int index = xfrm6_tunnel_spi_hash_byspi(spi);
+       struct hlist_node *pos;
+
+       hlist_for_each_entry(x6spi, pos,
+                            &xfrm6_tunnel_spi_byspi[index],
+                            list_byspi) {
+               if (x6spi->spi == spi)
+                       return -1;
+       }
+       return index;
+}
+
 static u32 __xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr)
 {
        u32 spi;
        struct xfrm6_tunnel_spi *x6spi;
-       struct hlist_node *pos;
-       unsigned index;
+       int index;
 
        if (xfrm6_tunnel_spi < XFRM6_TUNNEL_SPI_MIN ||
            xfrm6_tunnel_spi >= XFRM6_TUNNEL_SPI_MAX)
@@ -154,32 +168,19 @@ static u32 __xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr)
                xfrm6_tunnel_spi++;
 
        for (spi = xfrm6_tunnel_spi; spi <= XFRM6_TUNNEL_SPI_MAX; spi++) {
-               index = xfrm6_tunnel_spi_hash_byspi(spi);
-               hlist_for_each_entry(x6spi, pos, 
-                                    &xfrm6_tunnel_spi_byspi[index], 
-                                    list_byspi) {
-                       if (x6spi->spi == spi)
-                               goto try_next_1;
-               }
-               xfrm6_tunnel_spi = spi;
-               goto alloc_spi;
-try_next_1:;
+               index = __xfrm6_tunnel_spi_check(spi);
+               if (index >= 0)
+                       goto alloc_spi;
        }
        for (spi = XFRM6_TUNNEL_SPI_MIN; spi < xfrm6_tunnel_spi; spi++) {
-               index = xfrm6_tunnel_spi_hash_byspi(spi);
-               hlist_for_each_entry(x6spi, pos, 
-                                    &xfrm6_tunnel_spi_byspi[index], 
-                                    list_byspi) {
-                       if (x6spi->spi == spi)
-                               goto try_next_2;
-               }
-               xfrm6_tunnel_spi = spi;
-               goto alloc_spi;
-try_next_2:;
+               index = __xfrm6_tunnel_spi_check(spi);
+               if (index >= 0)
+                       goto alloc_spi;
        }
        spi = 0;
        goto out;
 alloc_spi:
+       xfrm6_tunnel_spi = spi;
        x6spi = kmem_cache_alloc(xfrm6_tunnel_spi_kmem, GFP_ATOMIC);
        if (!x6spi)
                goto out;
@@ -222,7 +223,7 @@ void xfrm6_tunnel_free_spi(xfrm_address_t *saddr)
 
        write_lock_bh(&xfrm6_tunnel_spi_lock);
 
-       hlist_for_each_entry_safe(x6spi, pos, n, 
+       hlist_for_each_entry_safe(x6spi, pos, n,
                                  &xfrm6_tunnel_spi_byaddr[xfrm6_tunnel_spi_hash_byaddr(saddr)],
                                  list_byaddr)
        {
@@ -242,26 +243,22 @@ EXPORT_SYMBOL(xfrm6_tunnel_free_spi);
 
 static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
 {
-       struct ipv6hdr *top_iph;
-
-       top_iph = (struct ipv6hdr *)skb->data;
-       top_iph->payload_len = htons(skb->len - sizeof(struct ipv6hdr));
-
+       skb_push(skb, -skb_network_offset(skb));
        return 0;
 }
 
 static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
 {
-       return 0;
+       return skb_network_header(skb)[IP6CB(skb)->nhoff];
 }
 
 static int xfrm6_tunnel_rcv(struct sk_buff *skb)
 {
-       struct ipv6hdr *iph = skb->nh.ipv6h;
+       struct ipv6hdr *iph = ipv6_hdr(skb);
        __be32 spi;
 
        spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&iph->saddr);
-       return xfrm6_rcv_spi(skb, spi);
+       return xfrm6_rcv_spi(skb, IPPROTO_IPV6, spi) > 0 ? : 0;
 }
 
 static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
@@ -269,9 +266,9 @@ static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 {
        /* xfrm6_tunnel native err handling */
        switch (type) {
-       case ICMPV6_DEST_UNREACH: 
+       case ICMPV6_DEST_UNREACH:
                switch (code) {
-               case ICMPV6_NOROUTE: 
+               case ICMPV6_NOROUTE:
                case ICMPV6_ADM_PROHIBITED:
                case ICMPV6_NOT_NEIGHBOUR:
                case ICMPV6_ADDR_UNREACH:
@@ -287,7 +284,7 @@ static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
                case ICMPV6_EXC_HOPLIMIT:
                        break;
                case ICMPV6_EXC_FRAGTIME:
-               default: 
+               default:
                        break;
                }
                break;
@@ -323,7 +320,7 @@ static void xfrm6_tunnel_destroy(struct xfrm_state *x)
        xfrm6_tunnel_free_spi((xfrm_address_t *)&x->props.saddr);
 }
 
-static struct xfrm_type xfrm6_tunnel_type = {
+static const struct xfrm_type xfrm6_tunnel_type = {
        .description    = "IP6IP6",
        .owner          = THIS_MODULE,
        .proto          = IPPROTO_IPV6,
@@ -339,17 +336,29 @@ static struct xfrm6_tunnel xfrm6_tunnel_handler = {
        .priority       = 2,
 };
 
+static struct xfrm6_tunnel xfrm46_tunnel_handler = {
+       .handler        = xfrm6_tunnel_rcv,
+       .err_handler    = xfrm6_tunnel_err,
+       .priority       = 2,
+};
+
 static int __init xfrm6_tunnel_init(void)
 {
        if (xfrm_register_type(&xfrm6_tunnel_type, AF_INET6) < 0)
                return -EAGAIN;
 
-       if (xfrm6_tunnel_register(&xfrm6_tunnel_handler)) {
+       if (xfrm6_tunnel_register(&xfrm6_tunnel_handler, AF_INET6)) {
+               xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
+               return -EAGAIN;
+       }
+       if (xfrm6_tunnel_register(&xfrm46_tunnel_handler, AF_INET)) {
+               xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
                xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
                return -EAGAIN;
        }
        if (xfrm6_tunnel_spi_init() < 0) {
-               xfrm6_tunnel_deregister(&xfrm6_tunnel_handler);
+               xfrm6_tunnel_deregister(&xfrm46_tunnel_handler, AF_INET);
+               xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
                xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
                return -EAGAIN;
        }
@@ -359,10 +368,12 @@ static int __init xfrm6_tunnel_init(void)
 static void __exit xfrm6_tunnel_fini(void)
 {
        xfrm6_tunnel_spi_fini();
-       xfrm6_tunnel_deregister(&xfrm6_tunnel_handler);
+       xfrm6_tunnel_deregister(&xfrm46_tunnel_handler, AF_INET);
+       xfrm6_tunnel_deregister(&xfrm6_tunnel_handler, AF_INET6);
        xfrm_unregister_type(&xfrm6_tunnel_type, AF_INET6);
 }
 
 module_init(xfrm6_tunnel_init);
 module_exit(xfrm6_tunnel_fini);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_XFRM_TYPE(AF_INET6, XFRM_PROTO_IPV6);