Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6-omap-h63xx.git] / net / ipv4 / netfilter / ipt_REDIRECT.c

diff --git a/net/ipv4/netfilter/ipt_REDIRECT.c b/net/ipv4/netfilter/ipt_REDIRECT.c
index c2b6b80670f8bf89cfd68c16b396bdee1d4a99cc..6ac7a23733169f1846f1c6eaba298ca4eb34d5dd 100644 (file)
--- a/net/ipv4/netfilter/ipt_REDIRECT.c
+++ b/net/ipv4/netfilter/ipt_REDIRECT.c
@@ -19,41 +19,31 @@
 #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
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
 MODULE_DESCRIPTION("iptables REDIRECT target module");
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
 /* FIXME: Take multiple ranges --RR */
-static int
+static bool
 redirect_check(const char *tablename,
               const void *e,
               const struct xt_target *target,
               void *targinfo,
               unsigned int hook_mask)
 {
-       const struct ip_nat_multi_range_compat *mr = targinfo;
+       const struct nf_nat_multi_range_compat *mr = targinfo;
 
        if (mr->range[0].flags & IP_NAT_RANGE_MAP_IPS) {
-               DEBUGP("redirect_check: bad MAP_IPS.\n");
-               return 0;
+               pr_debug("redirect_check: bad MAP_IPS.\n");
+               return false;
        }
        if (mr->rangesize != 1) {
-               DEBUGP("redirect_check: bad rangesize %u.\n", mr->rangesize);
-               return 0;
+               pr_debug("redirect_check: bad rangesize %u.\n", mr->rangesize);
+               return false;
        }
-       return 1;
+       return true;
 }
 
 static unsigned int
@@ -64,17 +54,17 @@ redirect_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;
        __be32 newdst;
-       const struct ip_nat_multi_range_compat *mr = targinfo;
-       struct ip_nat_range newrange;
+       const struct nf_nat_multi_range_compat *mr = targinfo;
+       struct nf_nat_range newrange;
 
-       IP_NF_ASSERT(hooknum == NF_IP_PRE_ROUTING
+       NF_CT_ASSERT(hooknum == NF_IP_PRE_ROUTING
                     || hooknum == NF_IP_LOCAL_OUT);
 
-       ct = ip_conntrack_get(*pskb, &ctinfo);
-       IP_NF_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED));
+       ct = nf_ct_get(*pskb, &ctinfo);
+       NF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED));
 
        /* Local packets: make them go to loopback */
        if (hooknum == NF_IP_LOCAL_OUT)
@@ -96,20 +86,20 @@ redirect_target(struct sk_buff **pskb,
        }
 
        /* Transfer from original range. */
-       newrange = ((struct ip_nat_range)
+       newrange = ((struct nf_nat_range)
                { mr->range[0].flags | IP_NAT_RANGE_MAP_IPS,
                  newdst, newdst,
                  mr->range[0].min, mr->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 redirect_reg = {
+static struct xt_target redirect_reg __read_mostly = {
        .name           = "REDIRECT",
        .family         = AF_INET,
        .target         = redirect_target,
-       .targetsize     = sizeof(struct ip_nat_multi_range_compat),
+       .targetsize     = sizeof(struct nf_nat_multi_range_compat),
        .table          = "nat",
        .hooks          = (1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_OUT),
        .checkentry     = redirect_check,