Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

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

diff --git a/net/ipv4/netfilter/ipt_iprange.c b/net/ipv4/netfilter/ipt_iprange.c
index ae70112f5e06ac888ee69f86bf9eae7f81ba43fa..0106dc955a69900ba8593bb9b8ee517c71562983 100644 (file)
--- a/net/ipv4/netfilter/ipt_iprange.c
+++ b/net/ipv4/netfilter/ipt_iprange.c
@@ -10,76 +10,70 @@
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/ip.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
+#include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv4/ipt_iprange.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");
 MODULE_DESCRIPTION("iptables arbitrary IP range match module");
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
-static int
+static bool
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
       const struct xt_match *match,
       const void *matchinfo,
-      int offset, unsigned int protoff, int *hotdrop)
+      int offset, unsigned int protoff, bool *hotdrop)
 {
        const struct ipt_iprange_info *info = matchinfo;
-       const struct iphdr *iph = skb->nh.iph;
+       const struct iphdr *iph = ip_hdr(skb);
 
        if (info->flags & IPRANGE_SRC) {
-               if (((ntohl(iph->saddr) < ntohl(info->src.min_ip))
-                         || (ntohl(iph->saddr) > ntohl(info->src.max_ip)))
+               if ((ntohl(iph->saddr) < ntohl(info->src.min_ip)
+                         || ntohl(iph->saddr) > ntohl(info->src.max_ip))
                         ^ !!(info->flags & IPRANGE_SRC_INV)) {
-                       DEBUGP("src IP %u.%u.%u.%u NOT in range %s"
-                              "%u.%u.%u.%u-%u.%u.%u.%u\n",
-                               NIPQUAD(iph->saddr),
-                               info->flags & IPRANGE_SRC_INV ? "(INV) " : "",
-                               NIPQUAD(info->src.min_ip),
-                               NIPQUAD(info->src.max_ip));
-                       return 0;
+                       pr_debug("src IP %u.%u.%u.%u NOT in range %s"
+                                "%u.%u.%u.%u-%u.%u.%u.%u\n",
+                                NIPQUAD(iph->saddr),
+                                info->flags & IPRANGE_SRC_INV ? "(INV) " : "",
+                                NIPQUAD(info->src.min_ip),
+                                NIPQUAD(info->src.max_ip));
+                       return false;
                }
        }
        if (info->flags & IPRANGE_DST) {
-               if (((ntohl(iph->daddr) < ntohl(info->dst.min_ip))
-                         || (ntohl(iph->daddr) > ntohl(info->dst.max_ip)))
+               if ((ntohl(iph->daddr) < ntohl(info->dst.min_ip)
+                         || ntohl(iph->daddr) > ntohl(info->dst.max_ip))
                         ^ !!(info->flags & IPRANGE_DST_INV)) {
-                       DEBUGP("dst IP %u.%u.%u.%u NOT in range %s"
-                              "%u.%u.%u.%u-%u.%u.%u.%u\n",
-                               NIPQUAD(iph->daddr),
-                               info->flags & IPRANGE_DST_INV ? "(INV) " : "",
-                               NIPQUAD(info->dst.min_ip),
-                               NIPQUAD(info->dst.max_ip));
-                       return 0;
+                       pr_debug("dst IP %u.%u.%u.%u NOT in range %s"
+                                "%u.%u.%u.%u-%u.%u.%u.%u\n",
+                                NIPQUAD(iph->daddr),
+                                info->flags & IPRANGE_DST_INV ? "(INV) " : "",
+                                NIPQUAD(info->dst.min_ip),
+                                NIPQUAD(info->dst.max_ip));
+                       return false;
                }
        }
-       return 1;
+       return true;
 }
 
-static struct ipt_match iprange_match = {
+static struct xt_match iprange_match __read_mostly = {
        .name           = "iprange",
+       .family         = AF_INET,
        .match          = match,
        .matchsize      = sizeof(struct ipt_iprange_info),
-       .destroy        = NULL,
        .me             = THIS_MODULE
 };
 
-static int __init init(void)
+static int __init ipt_iprange_init(void)
 {
-       return ipt_register_match(&iprange_match);
+       return xt_register_match(&iprange_match);
 }
 
-static void __exit fini(void)
+static void __exit ipt_iprange_fini(void)
 {
-       ipt_unregister_match(&iprange_match);
+       xt_unregister_match(&iprange_match);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(ipt_iprange_init);
+module_exit(ipt_iprange_fini);