projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: xtables: move extension arguments into compound structure (3/6)
[deliverable/linux.git]
/
net
/
netfilter
/
xt_state.c
diff --git
a/net/netfilter/xt_state.c
b/net/netfilter/xt_state.c
index a776dc36a19343ae678cf192baa7ae680c4e1478..4c946cbd731f7cfe47b9333b13c7e861906f9298 100644
(file)
--- a/
net/netfilter/xt_state.c
+++ b/
net/netfilter/xt_state.c
@@
-21,12
+21,9
@@
MODULE_ALIAS("ipt_state");
MODULE_ALIAS("ip6t_state");
static bool
MODULE_ALIAS("ip6t_state");
static bool
-state_mt(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,
- bool *hotdrop)
+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;
enum ip_conntrack_info ctinfo;
unsigned int statebit;
@@
-40,28
+37,25
@@
state_mt(const struct sk_buff *skb, const struct net_device *in,
return (sinfo->statemask & statebit);
}
return (sinfo->statemask & statebit);
}
-static bool
-state_mt_check(const char *tablename, const void *inf,
- const struct xt_match *match, void *matchinfo,
- unsigned int hook_mask)
+static bool state_mt_check(const struct xt_mtchk_param *par)
{
{
- if (nf_ct_l3proto_try_module_get(match->family) < 0) {
+ if (nf_ct_l3proto_try_module_get(
par->
match->family) < 0) {
printk(KERN_WARNING "can't load conntrack support for "
printk(KERN_WARNING "can't load conntrack support for "
- "proto=%u\n", match->family);
+ "proto=%u\n",
par->
match->family);
return false;
}
return true;
}
return false;
}
return true;
}
-static void state_mt_destroy(const struct xt_m
atch *match, void *matchinfo
)
+static void state_mt_destroy(const struct xt_m
tdtor_param *par
)
{
{
- nf_ct_l3proto_module_put(match->family);
+ nf_ct_l3proto_module_put(
par->
match->family);
}
static struct xt_match state_mt_reg[] __read_mostly = {
{
.name = "state",
}
static struct xt_match state_mt_reg[] __read_mostly = {
{
.name = "state",
- .family =
AF_INET
,
+ .family =
NFPROTO_IPV4
,
.checkentry = state_mt_check,
.match = state_mt,
.destroy = state_mt_destroy,
.checkentry = state_mt_check,
.match = state_mt,
.destroy = state_mt_destroy,
@@
-70,7
+64,7
@@
static struct xt_match state_mt_reg[] __read_mostly = {
},
{
.name = "state",
},
{
.name = "state",
- .family =
AF_INET
6,
+ .family =
NFPROTO_IPV
6,
.checkentry = state_mt_check,
.match = state_mt,
.destroy = state_mt_destroy,
.checkentry = state_mt_check,
.match = state_mt,
.destroy = state_mt_destroy,
This page took
0.195695 seconds
and
5
git commands to generate.