Pull misc into release branch

[pandora-kernel.git] / net / netfilter / xt_helper.c

diff --git a/net/netfilter/xt_helper.c b/net/netfilter/xt_helper.c
index 407d1d5..0a1f4c6 100644 (file)
--- a/net/netfilter/xt_helper.c
+++ b/net/netfilter/xt_helper.c
@@ -5,26 +5,16 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- *   19 Mar 2002 Harald Welte <laforge@gnumonks.org>:
- *              - Port to newnat infrastructure
  */
 
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/netfilter.h>
-#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
-#include <linux/netfilter_ipv4/ip_conntrack.h>
-#include <linux/netfilter_ipv4/ip_conntrack_core.h>
-#include <linux/netfilter_ipv4/ip_conntrack_helper.h>
-#else
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_core.h>
 #include <net/netfilter/nf_conntrack_helper.h>
-#endif
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_helper.h>
-#include <net/netfilter/nf_conntrack_compat.h>
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Martin Josefsson <gandalf@netfilter.org>");
@@ -32,14 +22,8 @@ MODULE_DESCRIPTION("iptables helper match module");
 MODULE_ALIAS("ipt_helper");
 MODULE_ALIAS("ip6t_helper");
 
-#if 0
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
 
-#if defined(CONFIG_IP_NF_CONNTRACK) || defined(CONFIG_IP_NF_CONNTRACK_MODULE)
-static int
+static bool
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
@@ -47,110 +31,51 @@ match(const struct sk_buff *skb,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
-      int *hotdrop)
+      bool *hotdrop)
 {
        const struct xt_helper_info *info = matchinfo;
-       struct ip_conntrack *ct;
+       const struct nf_conn *ct;
+       const struct nf_conn_help *master_help;
+       const struct nf_conntrack_helper *helper;
        enum ip_conntrack_info ctinfo;
-       int ret = info->invert;
-
-       ct = ip_conntrack_get((struct sk_buff *)skb, &ctinfo);
-       if (!ct) {
-               DEBUGP("xt_helper: Eek! invalid conntrack?\n");
-               return ret;
-       }
+       bool ret = info->invert;
 
-       if (!ct->master) {
-               DEBUGP("xt_helper: conntrack %p has no master\n", ct);
+       ct = nf_ct_get(skb, &ctinfo);
+       if (!ct || !ct->master)
                return ret;
-       }
-
-       read_lock_bh(&ip_conntrack_lock);
-       if (!ct->master->helper) {
-               DEBUGP("xt_helper: master ct %p has no helper\n",
-                       exp->expectant);
-               goto out_unlock;
-       }
-
-       DEBUGP("master's name = %s , info->name = %s\n",
-               ct->master->helper->name, info->name);
-
-       if (info->name[0] == '\0')
-               ret ^= 1;
-       else
-               ret ^= !strncmp(ct->master->helper->name, info->name,
-                               strlen(ct->master->helper->name));
-out_unlock:
-       read_unlock_bh(&ip_conntrack_lock);
-       return ret;
-}
-
-#else /* CONFIG_IP_NF_CONNTRACK */
-
-static int
-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)
-{
-       const struct xt_helper_info *info = matchinfo;
-       struct nf_conn *ct;
-       struct nf_conn_help *master_help;
-       enum ip_conntrack_info ctinfo;
-       int ret = info->invert;
 
-       ct = nf_ct_get((struct sk_buff *)skb, &ctinfo);
-       if (!ct) {
-               DEBUGP("xt_helper: Eek! invalid conntrack?\n");
+       master_help = nfct_help(ct->master);
+       if (!master_help)
                return ret;
-       }
 
-       if (!ct->master) {
-               DEBUGP("xt_helper: conntrack %p has no master\n", ct);
+       /* rcu_read_lock()ed by nf_hook_slow */
+       helper = rcu_dereference(master_help->helper);
+       if (!helper)
                return ret;
-       }
-
-       read_lock_bh(&nf_conntrack_lock);
-       master_help = nfct_help(ct->master);
-       if (!master_help || !master_help->helper) {
-               DEBUGP("xt_helper: master ct %p has no helper\n",
-                       exp->expectant);
-               goto out_unlock;
-       }
-
-       DEBUGP("master's name = %s , info->name = %s\n",
-               ct->master->helper->name, info->name);
 
        if (info->name[0] == '\0')
-               ret ^= 1;
+               ret = !ret;
        else
                ret ^= !strncmp(master_help->helper->name, info->name,
                                strlen(master_help->helper->name));
-out_unlock:
-       read_unlock_bh(&nf_conntrack_lock);
        return ret;
 }
-#endif
 
-static int check(const char *tablename,
-                const void *inf,
-                const struct xt_match *match,
-                void *matchinfo,
-                unsigned int hook_mask)
+static bool check(const char *tablename,
+                 const void *inf,
+                 const struct xt_match *match,
+                 void *matchinfo,
+                 unsigned int hook_mask)
 {
        struct xt_helper_info *info = matchinfo;
 
        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
                printk(KERN_WARNING "can't load conntrack support for "
                                    "proto=%d\n", match->family);
-               return 0;
+               return false;
        }
        info->name[29] = '\0';
-       return 1;
+       return true;
 }
 
 static void
@@ -159,7 +84,7 @@ destroy(const struct xt_match *match, void *matchinfo)
        nf_ct_l3proto_module_put(match->family);
 }
 
-static struct xt_match xt_helper_match[] = {
+static struct xt_match xt_helper_match[] __read_mostly = {
        {
                .name           = "helper",
                .family         = AF_INET,