linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / ipv6 / xfrm6_output.c

diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index c8c8b44..8024217 100644 (file)
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -14,9 +14,68 @@
 #include <linux/spinlock.h>
 #include <linux/icmpv6.h>
 #include <linux/netfilter_ipv6.h>
+#include <net/dsfield.h>
+#include <net/inet_ecn.h>
 #include <net/ipv6.h>
 #include <net/xfrm.h>
 
+/* Add encapsulation header.
+ *
+ * In transport mode, the IP header and mutable extension headers will be moved
+ * forward to make space for the encapsulation header.
+ *
+ * In tunnel mode, the top IP header will be constructed per RFC 2401.
+ * The following fields in it shall be filled in by x->type->output:
+ *     payload_len
+ *
+ * On exit, skb->h will be set to the start of the encapsulation header to be
+ * filled in by x->type->output and skb->nh will be set to the nextheader field
+ * of the extension header directly preceding the encapsulation header, or in
+ * its absence, that of the top IP header.  The value of skb->data will always
+ * point to the top IP header.
+ */
+static void xfrm6_encap(struct sk_buff *skb)
+{
+       struct dst_entry *dst = skb->dst;
+       struct xfrm_state *x = dst->xfrm;
+       struct ipv6hdr *iph, *top_iph;
+       int dsfield;
+
+       skb_push(skb, x->props.header_len);
+       iph = skb->nh.ipv6h;
+
+       if (!x->props.mode) {
+               u8 *prevhdr;
+               int hdr_len;
+
+               hdr_len = ip6_find_1stfragopt(skb, &prevhdr);
+               skb->nh.raw = prevhdr - x->props.header_len;
+               skb->h.raw = skb->data + hdr_len;
+               memmove(skb->data, iph, hdr_len);
+               return;
+       }
+
+       skb->nh.raw = skb->data;
+       top_iph = skb->nh.ipv6h;
+       skb->nh.raw = &top_iph->nexthdr;
+       skb->h.ipv6h = top_iph + 1;
+
+       top_iph->version = 6;
+       top_iph->priority = iph->priority;
+       top_iph->flow_lbl[0] = iph->flow_lbl[0];
+       top_iph->flow_lbl[1] = iph->flow_lbl[1];
+       top_iph->flow_lbl[2] = iph->flow_lbl[2];
+       dsfield = ipv6_get_dsfield(top_iph);
+       dsfield = INET_ECN_encapsulate(dsfield, dsfield);
+       if (x->props.flags & XFRM_STATE_NOECN)
+               dsfield &= ~INET_ECN_MASK;
+       ipv6_change_dsfield(top_iph, 0, dsfield);
+       top_iph->nexthdr = IPPROTO_IPV6; 
+       top_iph->hop_limit = dst_metric(dst->child, RTAX_HOPLIMIT);
+       ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);
+       ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr);
+}
+
 static int xfrm6_tunnel_check_size(struct sk_buff *skb)
 {
        int mtu, ret = 0;
@@ -59,9 +118,7 @@ static int xfrm6_output_one(struct sk_buff *skb)
                if (err)
                        goto error;
 
-               err = x->mode->output(skb);
-               if (err)
-                       goto error;
+               xfrm6_encap(skb);
 
                err = x->type->output(x, skb);
                if (err)
@@ -94,7 +151,7 @@ error_nolock:
        goto out_exit;
 }
 
-static int xfrm6_output_finish2(struct sk_buff *skb)
+static int xfrm6_output_finish(struct sk_buff *skb)
 {
        int err;
 
@@ -110,7 +167,7 @@ static int xfrm6_output_finish2(struct sk_buff *skb)
                        return dst_output(skb);
 
                err = nf_hook(PF_INET6, NF_IP6_POST_ROUTING, &skb, NULL,
-                             skb->dst->dev, xfrm6_output_finish2);
+                             skb->dst->dev, xfrm6_output_finish);
                if (unlikely(err != 1))
                        break;
        }
@@ -118,41 +175,6 @@ static int xfrm6_output_finish2(struct sk_buff *skb)
        return err;
 }
 
-static int xfrm6_output_finish(struct sk_buff *skb)
-{
-       struct sk_buff *segs;
-
-       if (!skb_is_gso(skb))
-               return xfrm6_output_finish2(skb);
-
-       skb->protocol = htons(ETH_P_IPV6);
-       segs = skb_gso_segment(skb, 0);
-       kfree_skb(skb);
-       if (unlikely(IS_ERR(segs)))
-               return PTR_ERR(segs);
-
-       do {
-               struct sk_buff *nskb = segs->next;
-               int err;
-
-               segs->next = NULL;
-               err = xfrm6_output_finish2(segs);
-
-               if (unlikely(err)) {
-                       while ((segs = nskb)) {
-                               nskb = segs->next;
-                               segs->next = NULL;
-                               kfree_skb(segs);
-                       }
-                       return err;
-               }
-
-               segs = nskb;
-       } while (segs);
-
-       return 0;
-}
-
 int xfrm6_output(struct sk_buff *skb)
 {
        return NF_HOOK(PF_INET6, NF_IP6_POST_ROUTING, skb, NULL, skb->dst->dev,