X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=net%2Fnetfilter%2Fxt_state.c;h=4c946cbd731f7cfe47b9333b13c7e861906f9298;hb=6be3d8598e883fb632edf059ba2f8d1b9f4da138;hp=b8ec00cd51fc1d16b4c04c17dbbbed0e5b57af0b;hpb=c49867347404c46f137a261643ed4fce4376f324;p=safe%2Fjmp%2Flinux-2.6

diff --git a/net/netfilter/xt_state.c b/net/netfilter/xt_state.c
index b8ec00c..4c946cb 100644
--- 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>
 
@@ -20,23 +20,16 @@ MODULE_DESCRIPTION("ip[6]_tables connection tracking state match module");
 MODULE_ALIAS("ipt_state");
 MODULE_ALIAS("ip6t_state");
 
-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)
+static bool
+state_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-	const struct xt_state_info *sinfo = matchinfo;
+	const struct xt_state_info *sinfo = par->matchinfo;
 	enum ip_conntrack_info ctinfo;
 	unsigned int statebit;
 
 	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,42 +37,51 @@ match(const struct sk_buff *skb,
 	return (sinfo->statemask & statebit);
 }
 
-static struct xt_match state_match = {
-	.name		= "state",
-	.match		= match,
-	.matchsize	= sizeof(struct xt_state_info),
-	.me		= THIS_MODULE,
-};
-
-static struct xt_match state6_match = {
-	.name		= "state",
-	.match		= match,
-	.matchsize	= sizeof(struct xt_state_info),
-	.me		= THIS_MODULE,
-};
-
-static int __init init(void)
+static bool state_mt_check(const struct xt_mtchk_param *par)
 {
-	int ret;
-
-	need_conntrack();
+	if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
+		printk(KERN_WARNING "can't load conntrack support for "
+				    "proto=%u\n", par->match->family);
+		return false;
+	}
+	return true;
+}
 
-	ret = xt_register_match(AF_INET, &state_match);
-	if (ret < 0)
-		return ret;
+static void state_mt_destroy(const struct xt_mtdtor_param *par)
+{
+	nf_ct_l3proto_module_put(par->match->family);
+}
 
-	ret = xt_register_match(AF_INET6, &state6_match);
-	if (ret < 0)
-		xt_unregister_match(AF_INET,&state_match);
+static struct xt_match state_mt_reg[] __read_mostly = {
+	{
+		.name		= "state",
+		.family		= NFPROTO_IPV4,
+		.checkentry	= state_mt_check,
+		.match		= state_mt,
+		.destroy	= state_mt_destroy,
+		.matchsize	= sizeof(struct xt_state_info),
+		.me		= THIS_MODULE,
+	},
+	{
+		.name		= "state",
+		.family		= NFPROTO_IPV6,
+		.checkentry	= state_mt_check,
+		.match		= state_mt,
+		.destroy	= state_mt_destroy,
+		.matchsize	= sizeof(struct xt_state_info),
+		.me		= THIS_MODULE,
+	},
+};
 
-	return ret;
+static int __init state_mt_init(void)
+{
+	return xt_register_matches(state_mt_reg, ARRAY_SIZE(state_mt_reg));
 }
 
-static void __exit fini(void)
+static void __exit state_mt_exit(void)
 {
-	xt_unregister_match(AF_INET, &state_match);
-	xt_unregister_match(AF_INET6, &state6_match);
+	xt_unregister_matches(state_mt_reg, ARRAY_SIZE(state_mt_reg));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(state_mt_init);
+module_exit(state_mt_exit);