[NETFILTER]: Introduce NF_INET_ hook values

[safe/jmp/linux-2.6] / net / ipv6 / xfrm6_input.c

diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index 02f69e5..e2c3efd 100644 (file)
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -16,126 +16,42 @@
 #include <net/ipv6.h>
 #include <net/xfrm.h>
 
-int xfrm6_rcv_spi(struct sk_buff *skb, __be32 spi)
+int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb)
 {
-       int err;
-       __be32 seq;
-       struct xfrm_state *xfrm_vec[XFRM_MAX_DEPTH];
-       struct xfrm_state *x;
-       int xfrm_nr = 0;
-       int decaps = 0;
-       int nexthdr;
-       unsigned int nhoff;
-
-       nhoff = IP6CB(skb)->nhoff;
-       nexthdr = skb_network_header(skb)[nhoff];
-
-       seq = 0;
-       if (!spi && (err = xfrm_parse_spi(skb, nexthdr, &spi, &seq)) != 0)
-               goto drop;
-
-       do {
-               struct ipv6hdr *iph = ipv6_hdr(skb);
-
-               if (xfrm_nr == XFRM_MAX_DEPTH)
-                       goto drop;
-
-               x = xfrm_state_lookup((xfrm_address_t *)&iph->daddr, spi,
-                               nexthdr != IPPROTO_IPIP ? nexthdr : IPPROTO_IPV6, AF_INET6);
-               if (x == NULL)
-                       goto drop;
-               spin_lock(&x->lock);
-               if (unlikely(x->km.state != XFRM_STATE_VALID))
-                       goto drop_unlock;
-
-               if (x->props.replay_window && xfrm_replay_check(x, seq))
-                       goto drop_unlock;
-
-               if (xfrm_state_check_expire(x))
-                       goto drop_unlock;
-
-               nexthdr = x->type->input(x, skb);
-               if (nexthdr <= 0)
-                       goto drop_unlock;
-
-               skb_network_header(skb)[nhoff] = nexthdr;
-
-               if (x->props.replay_window)
-                       xfrm_replay_advance(x, seq);
-
-               x->curlft.bytes += skb->len;
-               x->curlft.packets++;
-
-               spin_unlock(&x->lock);
-
-               xfrm_vec[xfrm_nr++] = x;
-
-               if (x->mode->input(x, skb))
-                       goto drop;
-
-               if (x->props.mode == XFRM_MODE_TUNNEL) { /* XXX */
-                       decaps = 1;
-                       break;
-               }
-
-               if ((err = xfrm_parse_spi(skb, nexthdr, &spi, &seq)) < 0)
-                       goto drop;
-       } while (!err);
-
-       /* Allocate new secpath or COW existing one. */
-       if (!skb->sp || atomic_read(&skb->sp->refcnt) != 1) {
-               struct sec_path *sp;
-               sp = secpath_dup(skb->sp);
-               if (!sp)
-                       goto drop;
-               if (skb->sp)
-                       secpath_put(skb->sp);
-               skb->sp = sp;
-       }
-
-       if (xfrm_nr + skb->sp->len > XFRM_MAX_DEPTH)
-               goto drop;
+       return xfrm6_extract_header(skb);
+}
 
-       memcpy(skb->sp->xvec + skb->sp->len, xfrm_vec,
-              xfrm_nr * sizeof(xfrm_vec[0]));
-       skb->sp->len += xfrm_nr;
-       skb->ip_summed = CHECKSUM_NONE;
+int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)
+{
+       XFRM_SPI_SKB_CB(skb)->daddroff = offsetof(struct ipv6hdr, daddr);
+       return xfrm_input(skb, nexthdr, spi, 0);
+}
+EXPORT_SYMBOL(xfrm6_rcv_spi);
 
-       nf_reset(skb);
+int xfrm6_transport_finish(struct sk_buff *skb, int async)
+{
+       skb_network_header(skb)[IP6CB(skb)->nhoff] =
+               XFRM_MODE_SKB_CB(skb)->protocol;
 
-       if (decaps) {
-               dst_release(skb->dst);
-               skb->dst = NULL;
-               netif_rx(skb);
-               return -1;
-       } else {
 #ifdef CONFIG_NETFILTER
-               ipv6_hdr(skb)->payload_len = htons(skb->len);
-               __skb_push(skb, skb->data - skb_network_header(skb));
+       ipv6_hdr(skb)->payload_len = htons(skb->len);
+       __skb_push(skb, skb->data - skb_network_header(skb));
 
-               NF_HOOK(PF_INET6, NF_IP6_PRE_ROUTING, skb, skb->dev, NULL,
-                       ip6_rcv_finish);
-               return -1;
+       NF_HOOK(PF_INET6, NF_INET_PRE_ROUTING, skb, skb->dev, NULL,
+               ip6_rcv_finish);
+       return -1;
 #else
-               return 1;
-#endif
-       }
+       if (async)
+               return ip6_rcv_finish(skb);
 
-drop_unlock:
-       spin_unlock(&x->lock);
-       xfrm_state_put(x);
-drop:
-       while (--xfrm_nr >= 0)
-               xfrm_state_put(xfrm_vec[xfrm_nr]);
-       kfree_skb(skb);
-       return -1;
+       return 1;
+#endif
 }
 
-EXPORT_SYMBOL(xfrm6_rcv_spi);
-
 int xfrm6_rcv(struct sk_buff *skb)
 {
-       return xfrm6_rcv_spi(skb, 0);
+       return xfrm6_rcv_spi(skb, skb_network_header(skb)[IP6CB(skb)->nhoff],
+                            0);
 }
 
 EXPORT_SYMBOL(xfrm6_rcv);