Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / net / ipv4 / netfilter / ipt_MASQUERADE.c

diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index b5955f3a3f8f0866a429493264b5ecef276a0791..3e0b562b2db704571b044b928e6bea712b9167b7 100644 (file)
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -19,46 +19,36 @@
 #include <net/ip.h>
 #include <net/checksum.h>
 #include <net/route.h>
-#include <linux/netfilter_ipv4.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.h>
 #include <linux/netfilter/x_tables.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
 MODULE_DESCRIPTION("iptables MASQUERADE target module");
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
 /* Lock protects masq region inside conntrack */
 static DEFINE_RWLOCK(masq_lock);
 
 /* FIXME: Multiple targets. --RR */
-static int
+static bool
 masquerade_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("masquerade_check: bad MAP_IPS.\n");
-               return 0;
+               pr_debug("masquerade_check: bad MAP_IPS.\n");
+               return false;
        }
        if (mr->rangesize != 1) {
-               DEBUGP("masquerade_check: bad rangesize %u.\n", mr->rangesize);
-               return 0;
+               pr_debug("masquerade_check: bad rangesize %u\n", mr->rangesize);
+               return false;
        }
-       return 1;
+       return true;
 }
 
 static unsigned int
@@ -69,33 +59,26 @@ masquerade_target(struct sk_buff **pskb,
                  const struct xt_target *target,
                  const void *targinfo)
 {
-#ifdef CONFIG_NF_NAT_NEEDED
+       struct nf_conn *ct;
        struct nf_conn_nat *nat;
-#endif
-       struct ip_conntrack *ct;
        enum ip_conntrack_info ctinfo;
-       struct ip_nat_range newrange;
-       const struct ip_nat_multi_range_compat *mr;
-       struct rtable *rt;
+       struct nf_nat_range newrange;
+       const struct nf_nat_multi_range_compat *mr;
+       const struct rtable *rt;
        __be32 newsrc;
 
-       IP_NF_ASSERT(hooknum == NF_IP_POST_ROUTING);
+       NF_CT_ASSERT(hooknum == NF_IP_POST_ROUTING);
 
-       ct = ip_conntrack_get(*pskb, &ctinfo);
-#ifdef CONFIG_NF_NAT_NEEDED
+       ct = nf_ct_get(*pskb, &ctinfo);
        nat = nfct_nat(ct);
-#endif
-       IP_NF_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED
+
+       NF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED
                            || ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY));
 
        /* Source address is 0.0.0.0 - locally generated packet that is
         * probably not supposed to be masqueraded.
         */
-#ifdef CONFIG_NF_NAT_NEEDED
        if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.ip == 0)
-#else
-       if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.ip == 0)
-#endif
                return NF_ACCEPT;
 
        mr = targinfo;
@@ -107,40 +90,30 @@ masquerade_target(struct sk_buff **pskb,
        }
 
        write_lock_bh(&masq_lock);
-#ifdef CONFIG_NF_NAT_NEEDED
        nat->masq_index = out->ifindex;
-#else
-       ct->nat.masq_index = out->ifindex;
-#endif
        write_unlock_bh(&masq_lock);
 
        /* Transfer from original range. */
-       newrange = ((struct ip_nat_range)
+       newrange = ((struct nf_nat_range)
                { mr->range[0].flags | IP_NAT_RANGE_MAP_IPS,
                  newsrc, newsrc,
                  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 inline int
-device_cmp(struct ip_conntrack *i, void *ifindex)
+static int
+device_cmp(struct nf_conn *i, void *ifindex)
 {
+       const struct nf_conn_nat *nat = nfct_nat(i);
        int ret;
-#ifdef CONFIG_NF_NAT_NEEDED
-       struct nf_conn_nat *nat = nfct_nat(i);
 
        if (!nat)
                return 0;
-#endif
 
        read_lock_bh(&masq_lock);
-#ifdef CONFIG_NF_NAT_NEEDED
        ret = (nat->masq_index == (int)(long)ifindex);
-#else
-       ret = (i->nat.masq_index == (int)(long)ifindex);
-#endif
        read_unlock_bh(&masq_lock);
 
        return ret;
@@ -150,15 +123,18 @@ static int masq_device_event(struct notifier_block *this,
                             unsigned long event,
                             void *ptr)
 {
-       struct net_device *dev = ptr;
+       const struct net_device *dev = ptr;
+
+       if (dev->nd_net != &init_net)
+               return NOTIFY_DONE;
 
        if (event == NETDEV_DOWN) {
                /* Device was downed.  Search entire table for
                   conntracks which were associated with that device,
                   and forget them. */
-               IP_NF_ASSERT(dev->ifindex != 0);
+               NF_CT_ASSERT(dev->ifindex != 0);
 
-               ip_ct_iterate_cleanup(device_cmp, (void *)(long)dev->ifindex);
+               nf_ct_iterate_cleanup(device_cmp, (void *)(long)dev->ifindex);
        }
 
        return NOTIFY_DONE;
@@ -168,15 +144,15 @@ static int masq_inet_event(struct notifier_block *this,
                           unsigned long event,
                           void *ptr)
 {
-       struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
+       const struct net_device *dev = ((struct in_ifaddr *)ptr)->ifa_dev->dev;
 
        if (event == NETDEV_DOWN) {
                /* IP address was deleted.  Search entire table for
                   conntracks which were associated with that device,
                   and forget them. */
-               IP_NF_ASSERT(dev->ifindex != 0);
+               NF_CT_ASSERT(dev->ifindex != 0);
 
-               ip_ct_iterate_cleanup(device_cmp, (void *)(long)dev->ifindex);
+               nf_ct_iterate_cleanup(device_cmp, (void *)(long)dev->ifindex);
        }
 
        return NOTIFY_DONE;
@@ -190,11 +166,11 @@ static struct notifier_block masq_inet_notifier = {
        .notifier_call  = masq_inet_event,
 };
 
-static struct xt_target masquerade = {
+static struct xt_target masquerade __read_mostly = {
        .name           = "MASQUERADE",
        .family         = AF_INET,
        .target         = masquerade_target,
-       .targetsize     = sizeof(struct ip_nat_multi_range_compat),
+       .targetsize     = sizeof(struct nf_nat_multi_range_compat),
        .table          = "nat",
        .hooks          = 1 << NF_IP_POST_ROUTING,
        .checkentry     = masquerade_check,