linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/net/netfilter/xt_helper.c b/net/netfilter/xt_helper.c
index 799c2a4..38b6715 100644 (file)
--- a/net/netfilter/xt_helper.c
+++ b/net/netfilter/xt_helper.c
@@ -42,7 +42,6 @@ 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,
@@ -90,7 +89,6 @@ 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,
@@ -98,7 +96,6 @@ match(const struct sk_buff *skb,
 {
        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;
        
@@ -114,8 +111,7 @@ match(const struct sk_buff *skb,
        }
 
        read_lock_bh(&nf_conntrack_lock);
-       master_help = nfct_help(ct->master);
-       if (!master_help || !master_help->helper) {
+       if (!ct->master->helper) {
                DEBUGP("xt_helper: master ct %p has no helper\n", 
                        exp->expectant);
                goto out_unlock;
@@ -127,8 +123,8 @@ match(const struct sk_buff *skb,
        if (info->name[0] == '\0')
                ret ^= 1;
        else
-               ret ^= !strncmp(master_help->helper->name, info->name,
-                               strlen(master_help->helper->name));
+               ret ^= !strncmp(ct->master->helper->name, info->name, 
+                               strlen(ct->master->helper->name));
 out_unlock:
        read_unlock_bh(&nf_conntrack_lock);
        return ret;
@@ -137,73 +133,56 @@ 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 void
-destroy(const struct xt_match *match, void *matchinfo, unsigned int matchsize)
-{
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
-       nf_ct_l3proto_module_put(match->family);
-#endif
+       /* verify size */
+       if (matchsize != XT_ALIGN(sizeof(struct xt_helper_info)))
+               return 0;
+
+       return 1;
 }
 
 static struct xt_match helper_match = {
        .name           = "helper",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_helper_info),
-       .checkentry     = check,
-       .destroy        = destroy,
-       .family         = AF_INET,
+       .match          = &match,
+       .checkentry     = &check,
        .me             = THIS_MODULE,
 };
 static struct xt_match helper6_match = {
        .name           = "helper",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_helper_info),
-       .checkentry     = check,
-       .destroy        = destroy,
-       .family         = AF_INET6,
+       .match          = &match,
+       .checkentry     = &check,
        .me             = THIS_MODULE,
 };
 
-static int __init xt_helper_init(void)
+static int __init init(void)
 {
        int ret;
        need_conntrack();
 
-       ret = xt_register_match(&helper_match);
+       ret = xt_register_match(AF_INET, &helper_match);
        if (ret < 0)
                return ret;
 
-       ret = xt_register_match(&helper6_match);
+       ret = xt_register_match(AF_INET6, &helper6_match);
        if (ret < 0)
-               xt_unregister_match(&helper_match);
+               xt_unregister_match(AF_INET, &helper_match);
 
        return ret;
 }
 
-static void __exit xt_helper_fini(void)
+static void __exit fini(void)
 {
-       xt_unregister_match(&helper_match);
-       xt_unregister_match(&helper6_match);
+       xt_unregister_match(AF_INET, &helper_match);
+       xt_unregister_match(AF_INET6, &helper6_match);
 }
 
-module_init(xt_helper_init);
-module_exit(xt_helper_fini);
+module_init(init);
+module_exit(fini);