VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / net / ipv4 / ipcomp.c

diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index e20c7e4..7ce7469 100644 (file)
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -18,7 +18,6 @@
 #include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/pfkeyv2.h>
-#include <net/inet_ecn.h>
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/icmp.h>
@@ -114,78 +113,34 @@ static int ipcomp_compress(struct xfrm_state *x, struct sk_buff *skb)
                goto out;
        }
        
-       memcpy(start, scratch, dlen);
-       pskb_trim(skb, ihlen + dlen);
+       memcpy(start + sizeof(struct ip_comp_hdr), scratch, dlen);
+       pskb_trim(skb, ihlen + dlen + sizeof(struct ip_comp_hdr));
        
 out:   
        return err;
 }
 
-static void ipcomp_tunnel_encap(struct xfrm_state *x, struct sk_buff *skb)
-{
-       struct dst_entry *dst = skb->dst;
-       struct iphdr *iph, *top_iph;
-
-       iph = skb->nh.iph;
-       top_iph = (struct iphdr *)skb_push(skb, sizeof(struct iphdr));
-       top_iph->ihl = 5;
-       top_iph->version = 4;
-       top_iph->tos = iph->tos;
-       top_iph->tot_len = htons(skb->len);
-       if (!(iph->frag_off&htons(IP_DF)))
-               __ip_select_ident(top_iph, dst, 0);
-       top_iph->ttl = iph->ttl;
-       top_iph->check = 0;
-       top_iph->saddr = x->props.saddr.a4;
-       top_iph->daddr = x->id.daddr.a4;
-       top_iph->frag_off = iph->frag_off&~htons(IP_MF|IP_OFFSET);
-       memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
-       skb->nh.raw = skb->data;
-}
-
 static int ipcomp_output(struct sk_buff **pskb)
 {
        int err;
        struct dst_entry *dst = (*pskb)->dst;
        struct xfrm_state *x = dst->xfrm;
-       struct iphdr *iph, *top_iph;
+       struct iphdr *iph;
        struct ip_comp_hdr *ipch;
        struct ipcomp_data *ipcd = x->data;
-       union {
-               struct iphdr    iph;
-               char            buf[60];
-       } tmp_iph;
        int hdr_len = 0;
 
-       if ((*pskb)->ip_summed == CHECKSUM_HW) {
-               err = skb_checksum_help(pskb, 0);
-               if (err)
-                       goto error_nolock;
-       }
-
-       spin_lock_bh(&x->lock);
-       err = xfrm_check_output(x, *pskb, AF_INET);
-       if (err)
-               goto error;
-
-       /* Don't bother compressing */
-       if (!x->props.mode) {
-               iph = (*pskb)->nh.iph;
-               hdr_len = iph->ihl * 4;
-       }
+       iph = (*pskb)->nh.iph;
+       iph->tot_len = htons((*pskb)->len);
+       hdr_len = iph->ihl * 4;
        if (((*pskb)->len - hdr_len) < ipcd->threshold) {
+               /* Don't bother compressing */
                if (x->props.mode) {
-                       ipcomp_tunnel_encap(x, *pskb);
-                       iph = (*pskb)->nh.iph;
-                       iph->protocol = IPPROTO_IPIP;
                        ip_send_check(iph);
                }
                goto out_ok;
        }
 
-       if (x->props.mode) 
-               ipcomp_tunnel_encap(x, *pskb);
-
        if ((skb_is_nonlinear(*pskb) || skb_cloned(*pskb)) &&
            skb_linearize(*pskb, GFP_ATOMIC) != 0) {
                err = -ENOMEM;
@@ -197,7 +152,6 @@ static int ipcomp_output(struct sk_buff **pskb)
                if (err == -EMSGSIZE) {
                        if (x->props.mode) {
                                iph = (*pskb)->nh.iph;
-                               iph->protocol = IPPROTO_IPIP;
                                ip_send_check(iph);
                        }
                        goto out_ok;
@@ -207,40 +161,19 @@ static int ipcomp_output(struct sk_buff **pskb)
 
        /* Install ipcomp header, convert into ipcomp datagram. */
        iph = (*pskb)->nh.iph;
-       memcpy(&tmp_iph, iph, iph->ihl * 4);
-       top_iph = (struct iphdr *)skb_push(*pskb, sizeof(struct ip_comp_hdr));
-       memcpy(top_iph, &tmp_iph, iph->ihl * 4);
-       iph = top_iph;
-       if (x->props.mode && (x->props.flags & XFRM_STATE_NOECN))
-               IP_ECN_clear(iph);
        iph->tot_len = htons((*pskb)->len);
-       iph->protocol = IPPROTO_COMP;
-       iph->check = 0;
        ipch = (struct ip_comp_hdr *)((char *)iph + iph->ihl * 4);
-       ipch->nexthdr = x->props.mode ? IPPROTO_IPIP : tmp_iph.iph.protocol;
+       ipch->nexthdr = iph->protocol;
        ipch->flags = 0;
        ipch->cpi = htons((u16 )ntohl(x->id.spi));
+       iph->protocol = IPPROTO_COMP;
        ip_send_check(iph);
-       (*pskb)->nh.raw = (*pskb)->data;
 
 out_ok:
-       x->curlft.bytes += (*pskb)->len;
-       x->curlft.packets++;
-       spin_unlock_bh(&x->lock);
-       
-       if (((*pskb)->dst = dst_pop(dst)) == NULL) {
-               err = -EHOSTUNREACH;
-               goto error_nolock;
-       }
-       err = NET_XMIT_BYPASS;
+       err = 0;
 
-out_exit:
-       return err;
 error:
-       spin_unlock_bh(&x->lock);
-error_nolock:
-       kfree_skb(*pskb);
-       goto out_exit;
+       return err;
 }
 
 static void ipcomp4_err(struct sk_buff *skb, u32 info)
@@ -361,7 +294,7 @@ static int ipcomp_init_state(struct xfrm_state *x, void *args)
                goto error;
 
        memset(ipcd, 0, sizeof(*ipcd));
-       x->props.header_len = sizeof(struct ip_comp_hdr);
+       x->props.header_len = 0;
        if (x->props.mode)
                x->props.header_len += sizeof(struct iphdr);
 
@@ -405,7 +338,7 @@ static struct xfrm_type ipcomp_type = {
        .output         = ipcomp_output
 };
 
-static struct inet_protocol ipcomp4_protocol = {
+static struct net_protocol ipcomp4_protocol = {
        .handler        =       xfrm4_rcv,
        .err_handler    =       ipcomp4_err,
        .no_policy      =       1,