fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / ipv4 / netfilter / ip_nat_proto_gre.c

diff --git a/net/ipv4/netfilter/ip_nat_proto_gre.c b/net/ipv4/netfilter/ip_nat_proto_gre.c
index 6c4899d..9581020 100644 (file)
--- a/net/ipv4/netfilter/ip_nat_proto_gre.c
+++ b/net/ipv4/netfilter/ip_nat_proto_gre.c
@@ -6,10 +6,10 @@
  * GRE is a generic encapsulation protocol, which is generally not very
  * suited for NAT, as it has no protocol-specific part as port numbers.
  *
- * It has an optional key field, which may help us distinguishing two 
+ * It has an optional key field, which may help us distinguishing two
  * connections between the same two hosts.
  *
- * GRE is defined in RFC 1701 and RFC 1702, as well as RFC 2784 
+ * GRE is defined in RFC 1701 and RFC 1702, as well as RFC 2784
  *
  * PPTP is built on top of a modified version of GRE, and has a mandatory
  * field called "CallID", which serves us for the same purpose as the key
@@ -23,7 +23,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/ip.h>
 #include <linux/netfilter_ipv4/ip_nat.h>
@@ -49,26 +48,26 @@ gre_in_range(const struct ip_conntrack_tuple *tuple,
             const union ip_conntrack_manip_proto *min,
             const union ip_conntrack_manip_proto *max)
 {
-       u_int32_t key;
+       __be16 key;
 
        if (maniptype == IP_NAT_MANIP_SRC)
                key = tuple->src.u.gre.key;
        else
                key = tuple->dst.u.gre.key;
 
-       return ntohl(key) >= ntohl(min->gre.key)
-               && ntohl(key) <= ntohl(max->gre.key);
+       return ntohs(key) >= ntohs(min->gre.key)
+               && ntohs(key) <= ntohs(max->gre.key);
 }
 
 /* generate unique tuple ... */
-static int 
+static int
 gre_unique_tuple(struct ip_conntrack_tuple *tuple,
                 const struct ip_nat_range *range,
                 enum ip_nat_manip_type maniptype,
                 const struct ip_conntrack *conntrack)
 {
        static u_int16_t key;
-       u_int16_t *keyptr;
+       __be16 *keyptr;
        unsigned int min, i, range_size;
 
        if (maniptype == IP_NAT_MANIP_SRC)
@@ -81,14 +80,14 @@ gre_unique_tuple(struct ip_conntrack_tuple *tuple,
                min = 1;
                range_size = 0xffff;
        } else {
-               min = ntohl(range->min.gre.key);
-               range_size = ntohl(range->max.gre.key) - min + 1;
+               min = ntohs(range->min.gre.key);
+               range_size = ntohs(range->max.gre.key) - min + 1;
        }
 
-       DEBUGP("min = %u, range_size = %u\n", min, range_size); 
+       DEBUGP("min = %u, range_size = %u\n", min, range_size);
 
        for (i = 0; i < range_size; i++, key++) {
-               *keyptr = htonl(min + key % range_size);
+               *keyptr = htons(min + key % range_size);
                if (!ip_nat_used_tuple(tuple, conntrack))
                        return 1;
        }
@@ -118,7 +117,7 @@ gre_manip_pkt(struct sk_buff **pskb,
        greh = (void *)(*pskb)->data + hdroff;
        pgreh = (struct gre_hdr_pptp *) greh;
 
-       /* we only have destination manip of a packet, since 'source key' 
+       /* we only have destination manip of a packet, since 'source key'
         * is not present in the packet itself */
        if (maniptype == IP_NAT_MANIP_DST) {
                /* key manipulation is always dest */
@@ -130,15 +129,14 @@ gre_manip_pkt(struct sk_buff **pskb,
                        }
                        if (greh->csum) {
                                /* FIXME: Never tested this code... */
-                               *(gre_csum(greh)) = 
-                                       ip_nat_cheat_check(~*(gre_key(greh)),
-                                                       tuple->dst.u.gre.key,
-                                                       *(gre_csum(greh)));
+                               nf_proto_csum_replace4(gre_csum(greh), *pskb,
+                                                       *(gre_key(greh)),
+                                                       tuple->dst.u.gre.key, 0);
                        }
                        *(gre_key(greh)) = tuple->dst.u.gre.key;
                        break;
                case GRE_VERSION_PPTP:
-                       DEBUGP("call_id -> 0x%04x\n", 
+                       DEBUGP("call_id -> 0x%04x\n",
                                ntohs(tuple->dst.u.gre.key));
                        pgreh->call_id = tuple->dst.u.gre.key;
                        break;
@@ -152,8 +150,8 @@ gre_manip_pkt(struct sk_buff **pskb,
 }
 
 /* nat helper struct */
-static struct ip_nat_protocol gre = { 
-       .name           = "GRE", 
+static struct ip_nat_protocol gre = {
+       .name           = "GRE",
        .protonum       = IPPROTO_GRE,
        .manip_pkt      = gre_manip_pkt,
        .in_range       = gre_in_range,
@@ -164,7 +162,7 @@ static struct ip_nat_protocol gre = {
        .nfattr_to_range        = ip_nat_port_nfattr_to_range,
 #endif
 };
-                                 
+
 int __init ip_nat_proto_gre_init(void)
 {
        return ip_nat_protocol_register(&gre);