Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/net/netfilter/xt_helper.c b/net/netfilter/xt_helper.c
index dc28f49c484bdf712983b2f8ecaa4224f2d65815..5d7818b73e3acf1547d264717c7381297fe4c510 100644 (file)
--- a/net/netfilter/xt_helper.c
+++ b/net/netfilter/xt_helper.c
@@ -42,6 +42,7 @@ 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,
@@ -89,6 +90,7 @@ 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,
@@ -135,53 +137,64 @@ out_unlock:
 
 static int check(const char *tablename,
                 const void *inf,
+                const struct xt_match *match,
                 void *matchinfo,
-                unsigned int matchsize,
                 unsigned int hook_mask)
 {
        struct xt_helper_info *info = matchinfo;
 
+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+       if (nf_ct_l3proto_try_module_get(match->family) < 0) {
+               printk(KERN_WARNING "can't load nf_conntrack support for "
+                                   "proto=%d\n", match->family);
+               return 0;
+       }
+#endif
        info->name[29] = '\0';
        return 1;
 }
 
-static struct xt_match helper_match = {
-       .name           = "helper",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_helper_info),
-       .checkentry     = check,
-       .me             = THIS_MODULE,
-};
-static struct xt_match helper6_match = {
-       .name           = "helper",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_helper_info),
-       .checkentry     = check,
-       .me             = THIS_MODULE,
+static void
+destroy(const struct xt_match *match, void *matchinfo)
+{
+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+       nf_ct_l3proto_module_put(match->family);
+#endif
+}
+
+static struct xt_match xt_helper_match[] = {
+       {
+               .name           = "helper",
+               .family         = AF_INET,
+               .checkentry     = check,
+               .match          = match,
+               .destroy        = destroy,
+               .matchsize      = sizeof(struct xt_helper_info),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "helper",
+               .family         = AF_INET6,
+               .checkentry     = check,
+               .match          = match,
+               .destroy        = destroy,
+               .matchsize      = sizeof(struct xt_helper_info),
+               .me             = THIS_MODULE,
+       },
 };
 
-static int __init init(void)
+static int __init xt_helper_init(void)
 {
-       int ret;
        need_conntrack();
-
-       ret = xt_register_match(AF_INET, &helper_match);
-       if (ret < 0)
-               return ret;
-
-       ret = xt_register_match(AF_INET6, &helper6_match);
-       if (ret < 0)
-               xt_unregister_match(AF_INET, &helper_match);
-
-       return ret;
+       return xt_register_matches(xt_helper_match,
+                                  ARRAY_SIZE(xt_helper_match));
 }
 
-static void __exit fini(void)
+static void __exit xt_helper_fini(void)
 {
-       xt_unregister_match(AF_INET, &helper_match);
-       xt_unregister_match(AF_INET6, &helper6_match);
+       xt_unregister_matches(xt_helper_match, ARRAY_SIZE(xt_helper_match));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_helper_init);
+module_exit(xt_helper_fini);