git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
netfilter
/
xt_state.c
diff --git
a/net/netfilter/xt_state.c
b/net/netfilter/xt_state.c
index
39ce808
..
df37b91
100644
(file)
--- a/
net/netfilter/xt_state.c
+++ b/
net/netfilter/xt_state.c
@@
-24,6
+24,7
@@
static int
match(const struct sk_buff *skb,
const struct net_device *in,
const struct net_device *out,
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,
const void *matchinfo,
int offset,
unsigned int protoff,
@@
-44,53
+45,55
@@
match(const struct sk_buff *skb,
}
static int check(const char *tablename,
}
static int check(const char *tablename,
- const void *ip,
+ const void *inf,
+ const struct xt_match *match,
void *matchinfo,
void *matchinfo,
- unsigned int matchsize,
unsigned int hook_mask)
{
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 0;
-
+ }
return 1;
}
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);