[NETLINK]: Remove error pointer from netlink message handler

[linux-2.6] / net / netfilter / xt_state.c

diff --git a/net/netfilter/xt_state.c b/net/netfilter/xt_state.c
index 39ce808d40ef7b834daeb598e3a9935d23e55f12..149294f7df7147bfc6c770db001396196563f341 100644 (file)
--- a/net/netfilter/xt_state.c
+++ b/net/netfilter/xt_state.c
@@ -10,7 +10,7 @@
 
 #include <linux/module.h>
 #include <linux/skbuff.h>
-#include <net/netfilter/nf_conntrack_compat.h>
+#include <net/netfilter/nf_conntrack.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_state.h>
 
@@ -24,6 +24,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,
@@ -35,7 +36,7 @@ match(const struct sk_buff *skb,
 
        if (nf_ct_is_untracked(skb))
                statebit = XT_STATE_UNTRACKED;
-       else if (!nf_ct_get_ctinfo(skb, &ctinfo))
+       else if (!nf_ct_get(skb, &ctinfo))
                statebit = XT_STATE_INVALID;
        else
                statebit = XT_STATE_BIT(ctinfo);
@@ -44,53 +45,55 @@ match(const struct sk_buff *skb,
 }
 
 static int check(const char *tablename,
-                const void *ip,
+                const void *inf,
+                const struct xt_match *match,
                 void *matchinfo,
-                unsigned int matchsize,
                 unsigned int hook_mask)
 {
-       if (matchsize != XT_ALIGN(sizeof(struct xt_state_info)))
+       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 1;
 }
 
-static struct xt_match state_match = {
-       .name           = "state",
-       .match          = &match,
-       .checkentry     = &check,
-       .me             = THIS_MODULE,
-};
+static void
+destroy(const struct xt_match *match, void *matchinfo)
+{
+       nf_ct_l3proto_module_put(match->family);
+}
 
-static struct xt_match state6_match = {
-       .name           = "state",
-       .match          = &match,
-       .checkentry     = &check,
-       .me             = THIS_MODULE,
+static struct xt_match xt_state_match[] = {
+       {
+               .name           = "state",
+               .family         = AF_INET,
+               .checkentry     = check,
+               .match          = match,
+               .destroy        = destroy,
+               .matchsize      = sizeof(struct xt_state_info),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "state",
+               .family         = AF_INET6,
+               .checkentry     = check,
+               .match          = match,
+               .destroy        = destroy,
+               .matchsize      = sizeof(struct xt_state_info),
+               .me             = THIS_MODULE,
+       },
 };
 
-static int __init init(void)
+static int __init xt_state_init(void)
 {
-       int ret;
-
-       need_conntrack();
-
-       ret = xt_register_match(AF_INET, &state_match);
-       if (ret < 0)
-               return ret;
-
-       ret = xt_register_match(AF_INET6, &state6_match);
-       if (ret < 0)
-               xt_unregister_match(AF_INET,&state_match);
-
-       return ret;
+       return xt_register_matches(xt_state_match, ARRAY_SIZE(xt_state_match));
 }
 
-static void __exit fini(void)
+static void __exit xt_state_fini(void)
 {
-       xt_unregister_match(AF_INET, &state_match);
-       xt_unregister_match(AF_INET6, &state6_match);
+       xt_unregister_matches(xt_state_match, ARRAY_SIZE(xt_state_match));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_state_init);
+module_exit(xt_state_fini);