[NETFILTER]: Remove changelogs and CVS IDs

[safe/jmp/linux-2.6] / net / ipv4 / netfilter / ipt_NETMAP.c

diff --git a/net/ipv4/netfilter/ipt_NETMAP.c b/net/ipv4/netfilter/ipt_NETMAP.c
index 58a88f2..068c69b 100644 (file)
--- a/net/ipv4/netfilter/ipt_NETMAP.c
+++ b/net/ipv4/netfilter/ipt_NETMAP.c
@@ -15,7 +15,8 @@
 #include <linux/netdevice.h>
 #include <linux/netfilter.h>
 #include <linux/netfilter_ipv4.h>
-#include <linux/netfilter_ipv4/ip_nat_rule.h>
+#include <linux/netfilter/x_tables.h>
+#include <net/netfilter/nf_nat_rule.h>
 
 #define MODULENAME "NETMAP"
 MODULE_LICENSE("GPL");
@@ -35,7 +36,7 @@ check(const char *tablename,
       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(MODULENAME":check: bad MAP_IPS.\n");
@@ -56,53 +57,54 @@ 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 new_ip, netmask;
-       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_POST_ROUTING
                     || hooknum == NF_IP_LOCAL_OUT);
-       ct = ip_conntrack_get(*pskb, &ctinfo);
+       ct = nf_ct_get(*pskb, &ctinfo);
 
        netmask = ~(mr->range[0].min_ip ^ mr->range[0].max_ip);
 
        if (hooknum == NF_IP_PRE_ROUTING || hooknum == NF_IP_LOCAL_OUT)
-               new_ip = (*pskb)->nh.iph->daddr & ~netmask;
+               new_ip = ip_hdr(*pskb)->daddr & ~netmask;
        else
-               new_ip = (*pskb)->nh.iph->saddr & ~netmask;
+               new_ip = ip_hdr(*pskb)->saddr & ~netmask;
        new_ip |= mr->range[0].min_ip & netmask;
 
-       newrange = ((struct ip_nat_range)
+       newrange = ((struct nf_nat_range)
                { mr->range[0].flags | IP_NAT_RANGE_MAP_IPS,
                  new_ip, new_ip,
                  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 ipt_target target_module = { 
+static struct xt_target target_module = {
        .name           = MODULENAME,
-       .target         = target, 
-       .targetsize     = sizeof(struct ip_nat_multi_range_compat),
+       .family         = AF_INET,
+       .target         = target,
+       .targetsize     = sizeof(struct nf_nat_multi_range_compat),
        .table          = "nat",
        .hooks          = (1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_POST_ROUTING) |
                          (1 << NF_IP_LOCAL_OUT),
        .checkentry     = check,
-       .me             = THIS_MODULE 
+       .me             = THIS_MODULE
 };
 
 static int __init ipt_netmap_init(void)
 {
-       return ipt_register_target(&target_module);
+       return xt_register_target(&target_module);
 }
 
 static void __exit ipt_netmap_fini(void)
 {
-       ipt_unregister_target(&target_module);
+       xt_unregister_target(&target_module);
 }
 
 module_init(ipt_netmap_init);