[NETFILTER]: nf_conntrack: replace NF_CT_DUMP_TUPLE macro indrection by function...
[linux-2.6.git] / net / netfilter / xt_connbytes.c
index 150d2a4..b15e7e2 100644 (file)
@@ -1,60 +1,39 @@
 /* Kernel module to match connection tracking byte counter.
  * GPL (C) 2002 Martin Devera (devik@cdi.cz).
- *
- * 2004-07-20 Harald Welte <laforge@netfilter.org>
- *     - reimplemented to use per-connection accounting counters
- *     - add functionality to match number of packets
- *     - add functionality to match average packet size
- *     - add support to match directions seperately
- * 2005-10-16 Harald Welte <laforge@netfilter.org>
- *     - Port to x_tables
- *
  */
 #include <linux/module.h>
+#include <linux/bitops.h>
 #include <linux/skbuff.h>
-#include <net/netfilter/nf_conntrack_compat.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_connbytes.h>
+#include <net/netfilter/nf_conntrack.h>
 
 #include <asm/div64.h>
-#include <asm/bitops.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
-MODULE_DESCRIPTION("iptables match for matching number of pkts/bytes per connection");
+MODULE_DESCRIPTION("Xtables: Number of packets/bytes per connection matching");
 MODULE_ALIAS("ipt_connbytes");
+MODULE_ALIAS("ip6t_connbytes");
 
-/* 64bit divisor, dividend and result. dynamic precision */
-static u_int64_t div64_64(u_int64_t dividend, u_int64_t divisor)
-{
-       u_int32_t d = divisor;
-
-       if (divisor > 0xffffffffULL) {
-               unsigned int shift = fls(divisor >> 32);
-
-               d = divisor >> shift;
-               dividend >>= shift;
-       }
-
-       do_div(dividend, d);
-       return dividend;
-}
-
-static int
-match(const struct sk_buff *skb,
-      const struct net_device *in,
-      const struct net_device *out,
-      const void *matchinfo,
-      int offset,
-      unsigned int protoff,
-      int *hotdrop)
+static bool
+connbytes_mt(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,
+             bool *hotdrop)
 {
        const struct xt_connbytes_info *sinfo = matchinfo;
+       const struct nf_conn *ct;
+       enum ip_conntrack_info ctinfo;
        u_int64_t what = 0;     /* initialize to make gcc happy */
+       u_int64_t bytes = 0;
+       u_int64_t pkts = 0;
        const struct ip_conntrack_counter *counters;
 
-       if (!(counters = nf_ct_get_counters(skb)))
-               return 0; /* no match */
+       ct = nf_ct_get(skb, &ctinfo);
+       if (!ct)
+               return false;
+       counters = ct->counters;
 
        switch (sinfo->what) {
        case XT_CONNBYTES_PKTS:
@@ -88,93 +67,94 @@ match(const struct sk_buff *skb,
        case XT_CONNBYTES_AVGPKT:
                switch (sinfo->direction) {
                case XT_CONNBYTES_DIR_ORIGINAL:
-                       what = div64_64(counters[IP_CT_DIR_ORIGINAL].bytes,
-                                       counters[IP_CT_DIR_ORIGINAL].packets);
+                       bytes = counters[IP_CT_DIR_ORIGINAL].bytes;
+                       pkts  = counters[IP_CT_DIR_ORIGINAL].packets;
                        break;
                case XT_CONNBYTES_DIR_REPLY:
-                       what = div64_64(counters[IP_CT_DIR_REPLY].bytes,
-                                       counters[IP_CT_DIR_REPLY].packets);
+                       bytes = counters[IP_CT_DIR_REPLY].bytes;
+                       pkts  = counters[IP_CT_DIR_REPLY].packets;
                        break;
                case XT_CONNBYTES_DIR_BOTH:
-                       {
-                               u_int64_t bytes;
-                               u_int64_t pkts;
-                               bytes = counters[IP_CT_DIR_ORIGINAL].bytes +
-                                       counters[IP_CT_DIR_REPLY].bytes;
-                               pkts = counters[IP_CT_DIR_ORIGINAL].packets+
-                                       counters[IP_CT_DIR_REPLY].packets;
-
-                               /* FIXME_THEORETICAL: what to do if sum
-                                * overflows ? */
-
-                               what = div64_64(bytes, pkts);
-                       }
+                       bytes = counters[IP_CT_DIR_ORIGINAL].bytes +
+                               counters[IP_CT_DIR_REPLY].bytes;
+                       pkts  = counters[IP_CT_DIR_ORIGINAL].packets +
+                               counters[IP_CT_DIR_REPLY].packets;
                        break;
                }
+               if (pkts != 0)
+                       what = div64_64(bytes, pkts);
                break;
        }
 
        if (sinfo->count.to)
-               return (what <= sinfo->count.to && what >= sinfo->count.from);
+               return what <= sinfo->count.to && what >= sinfo->count.from;
        else
-               return (what >= sinfo->count.from);
+               return what >= sinfo->count.from;
 }
 
-static int check(const char *tablename,
-                const void *ip,
-                void *matchinfo,
-                unsigned int matchsize,
-                unsigned int hook_mask)
+static bool
+connbytes_mt_check(const char *tablename, const void *ip,
+                   const struct xt_match *match, void *matchinfo,
+                   unsigned int hook_mask)
 {
        const struct xt_connbytes_info *sinfo = matchinfo;
 
-       if (matchsize != XT_ALIGN(sizeof(struct xt_connbytes_info)))
-               return 0;
-
        if (sinfo->what != XT_CONNBYTES_PKTS &&
            sinfo->what != XT_CONNBYTES_BYTES &&
            sinfo->what != XT_CONNBYTES_AVGPKT)
-               return 0;
+               return false;
 
        if (sinfo->direction != XT_CONNBYTES_DIR_ORIGINAL &&
            sinfo->direction != XT_CONNBYTES_DIR_REPLY &&
            sinfo->direction != XT_CONNBYTES_DIR_BOTH)
-               return 0;
+               return false;
+
+       if (nf_ct_l3proto_try_module_get(match->family) < 0) {
+               printk(KERN_WARNING "can't load conntrack support for "
+                                   "proto=%u\n", match->family);
+               return false;
+       }
 
-       return 1;
+       return true;
 }
 
-static struct xt_match connbytes_match = {
-       .name           = "connbytes",
-       .match          = &match,
-       .checkentry     = &check,
-       .me             = THIS_MODULE
-};
-static struct xt_match connbytes6_match = {
-       .name           = "connbytes",
-       .match          = &match,
-       .checkentry     = &check,
-       .me             = THIS_MODULE
+static void
+connbytes_mt_destroy(const struct xt_match *match, void *matchinfo)
+{
+       nf_ct_l3proto_module_put(match->family);
+}
+
+static struct xt_match connbytes_mt_reg[] __read_mostly = {
+       {
+               .name           = "connbytes",
+               .family         = AF_INET,
+               .checkentry     = connbytes_mt_check,
+               .match          = connbytes_mt,
+               .destroy        = connbytes_mt_destroy,
+               .matchsize      = sizeof(struct xt_connbytes_info),
+               .me             = THIS_MODULE
+       },
+       {
+               .name           = "connbytes",
+               .family         = AF_INET6,
+               .checkentry     = connbytes_mt_check,
+               .match          = connbytes_mt,
+               .destroy        = connbytes_mt_destroy,
+               .matchsize      = sizeof(struct xt_connbytes_info),
+               .me             = THIS_MODULE
+       },
 };
 
-static int __init init(void)
+static int __init connbytes_mt_init(void)
 {
-       int ret;
-       ret = xt_register_match(AF_INET, &connbytes_match);
-       if (ret)
-               return ret;
-
-       ret = xt_register_match(AF_INET6, &connbytes6_match);
-       if (ret)
-               xt_unregister_match(AF_INET, &connbytes_match);
-       return ret;
+       return xt_register_matches(connbytes_mt_reg,
+              ARRAY_SIZE(connbytes_mt_reg));
 }
 
-static void __exit fini(void)
+static void __exit connbytes_mt_exit(void)
 {
-       xt_unregister_match(AF_INET, &connbytes_match);
-       xt_unregister_match(AF_INET6, &connbytes6_match);
+       xt_unregister_matches(connbytes_mt_reg, ARRAY_SIZE(connbytes_mt_reg));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(connbytes_mt_init);
+module_exit(connbytes_mt_exit);