[IPSEC]: Separate inner/outer mode processing on input

[linux-2.6-omap-h63xx.git] / net / ipv6 / xfrm6_state.c

diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index baa461b9f74eebf97c654aa858203dcf010aa7e8..90fef0a4726fb449a540b8f3e951900edeaf288a 100644 (file)
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -14,6 +14,7 @@
 #include <net/xfrm.h>
 #include <linux/pfkeyv2.h>
 #include <linux/ipsec.h>
+#include <net/dsfield.h>
 #include <net/ipv6.h>
 #include <net/addrconf.h>
 
@@ -65,7 +66,7 @@ __xfrm6_state_sort(struct xfrm_state **dst, struct xfrm_state **src, int n)
                goto end;
 
        /* Rule 2: select MIPv6 RO or inbound trigger */
-#ifdef CONFIG_IPV6_MIP6
+#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
        for (i = 0; i < n; i++) {
                if (src[i] &&
                    (src[i]->props.mode == XFRM_MODE_ROUTEOPTIMIZATION ||
@@ -93,7 +94,8 @@ __xfrm6_state_sort(struct xfrm_state **dst, struct xfrm_state **src, int n)
        /* Rule 4: select IPsec tunnel */
        for (i = 0; i < n; i++) {
                if (src[i] &&
-                   src[i]->props.mode == XFRM_MODE_TUNNEL) {
+                   (src[i]->props.mode == XFRM_MODE_TUNNEL ||
+                    src[i]->props.mode == XFRM_MODE_BEET)) {
                        dst[j++] = src[i];
                        src[i] = NULL;
                }
@@ -130,7 +132,7 @@ __xfrm6_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n)
                goto end;
 
        /* Rule 2: select MIPv6 RO or inbound trigger */
-#ifdef CONFIG_IPV6_MIP6
+#if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
        for (i = 0; i < n; i++) {
                if (src[i] &&
                    (src[i]->mode == XFRM_MODE_ROUTEOPTIMIZATION ||
@@ -146,7 +148,8 @@ __xfrm6_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n)
        /* Rule 3: select IPsec tunnel */
        for (i = 0; i < n; i++) {
                if (src[i] &&
-                   src[i]->mode == XFRM_MODE_TUNNEL) {
+                   (src[i]->mode == XFRM_MODE_TUNNEL ||
+                    src[i]->mode == XFRM_MODE_BEET)) {
                        dst[j++] = src[i];
                        src[i] = NULL;
                }
@@ -166,12 +169,33 @@ __xfrm6_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n)
        return 0;
 }
 
+int xfrm6_extract_header(struct sk_buff *skb)
+{
+       struct ipv6hdr *iph = ipv6_hdr(skb);
+
+       XFRM_MODE_SKB_CB(skb)->id = 0;
+       XFRM_MODE_SKB_CB(skb)->frag_off = htons(IP_DF);
+       XFRM_MODE_SKB_CB(skb)->tos = ipv6_get_dsfield(iph);
+       XFRM_MODE_SKB_CB(skb)->ttl = iph->hop_limit;
+       XFRM_MODE_SKB_CB(skb)->protocol =
+               skb_network_header(skb)[IP6CB(skb)->nhoff];
+       memcpy(XFRM_MODE_SKB_CB(skb)->flow_lbl, iph->flow_lbl,
+              sizeof(XFRM_MODE_SKB_CB(skb)->flow_lbl));
+
+       return 0;
+}
+
 static struct xfrm_state_afinfo xfrm6_state_afinfo = {
        .family                 = AF_INET6,
+       .proto                  = IPPROTO_IPV6,
+       .eth_proto              = htons(ETH_P_IPV6),
+       .owner                  = THIS_MODULE,
        .init_tempsel           = __xfrm6_init_tempsel,
        .tmpl_sort              = __xfrm6_tmpl_sort,
        .state_sort             = __xfrm6_state_sort,
        .output                 = xfrm6_output,
+       .extract_input          = xfrm6_extract_input,
+       .extract_output         = xfrm6_extract_output,
 };
 
 void __init xfrm6_state_init(void)