- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.

[linux-flexiantxendom0-3.2.10.git] / net / ipv4 / netfilter / ipt_SAME.c

diff --git a/net/ipv4/netfilter/ipt_SAME.c b/net/ipv4/netfilter/ipt_SAME.c
index bd4404e..511e5ff 100644 (file)
--- a/net/ipv4/netfilter/ipt_SAME.c
+++ b/net/ipv4/netfilter/ipt_SAME.c
@@ -7,21 +7,6 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- * 010320 Martin Josefsson <gandalf@wlug.westbo.se>
- *     * copied ipt_BALANCE.c to ipt_SAME.c and changed a few things.
- * 010728 Martin Josefsson <gandalf@wlug.westbo.se>
- *     * added --nodst to not include destination-ip in new source
- *       calculations.
- *     * added some more sanity-checks.
- * 010729 Martin Josefsson <gandalf@wlug.westbo.se>
- *     * fixed a buggy if-statement in same_check(), should have
- *       used ntohl() but didn't.
- *     * added support for multiple ranges. IPT_SAME_MAX_RANGE is
- *       defined in linux/include/linux/netfilter_ipv4/ipt_SAME.h
- *       and is currently set to 10.
- *     * added support for 1-address range, nice to have now that
- *       we have multiple ranges.
  */
 #include <linux/types.h>
 #include <linux/ip.h>
@@ -35,11 +20,7 @@
 #include <net/checksum.h>
 #include <linux/netfilter_ipv4.h>
 #include <linux/netfilter/x_tables.h>
-#ifdef CONFIG_NF_NAT_NEEDED
 #include <net/netfilter/nf_nat_rule.h>
-#else
-#include <linux/netfilter_ipv4/ip_nat_rule.h>
-#endif
 #include <linux/netfilter_ipv4/ipt_SAME.h>
 
 MODULE_LICENSE("GPL");
@@ -138,17 +119,17 @@ same_target(struct sk_buff **pskb,
                const struct xt_target *target,
                const void *targinfo)
 {
-       struct ip_conntrack *ct;
+       struct nf_conn *ct;
        enum ip_conntrack_info ctinfo;
        u_int32_t tmpip, aindex;
        __be32 new_ip;
        const struct ipt_same_info *same = targinfo;
-       struct ip_nat_range newrange;
-       const struct ip_conntrack_tuple *t;
+       struct nf_nat_range newrange;
+       const struct nf_conntrack_tuple *t;
 
-       IP_NF_ASSERT(hooknum == NF_IP_PRE_ROUTING ||
+       NF_CT_ASSERT(hooknum == NF_IP_PRE_ROUTING ||
                        hooknum == NF_IP_POST_ROUTING);
-       ct = ip_conntrack_get(*pskb, &ctinfo);
+       ct = nf_ct_get(*pskb, &ctinfo);
 
        t = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
 
@@ -157,17 +138,10 @@ same_target(struct sk_buff **pskb,
           Here we calculate the index in same->iparray which
           holds the ipaddress we should use */
 
-#ifdef CONFIG_NF_NAT_NEEDED
        tmpip = ntohl(t->src.u3.ip);
 
        if (!(same->info & IPT_SAME_NODST))
                tmpip += ntohl(t->dst.u3.ip);
-#else
-       tmpip = ntohl(t->src.ip);
-
-       if (!(same->info & IPT_SAME_NODST))
-               tmpip += ntohl(t->dst.ip);
-#endif
        aindex = tmpip % same->ipnum;
 
        new_ip = htonl(same->iparray[aindex]);
@@ -178,13 +152,13 @@ same_target(struct sk_buff **pskb,
                        NIPQUAD(new_ip));
 
        /* Transfer from original range. */
-       newrange = ((struct ip_nat_range)
+       newrange = ((struct nf_nat_range)
                { same->range[0].flags, new_ip, new_ip,
                  /* FIXME: Use ports from correct range! */
                  same->range[0].min, same->range[0].max });
 
        /* Hand modified range to generic setup. */
-       return ip_nat_setup_info(ct, &newrange, hooknum);
+       return nf_nat_setup_info(ct, &newrange, hooknum);
 }
 
 static struct xt_target same_reg = {