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 149294f7df7147bfc6c770db001396196563f341..4c946cbd731f7cfe47b9333b13c7e861906f9298 100644
(file)
--- a/
net/netfilter/xt_state.c
+++ b/
net/netfilter/xt_state.c
@@
-20,17
+20,10
@@
MODULE_DESCRIPTION("ip[6]_tables connection tracking state match module");
MODULE_ALIAS("ipt_state");
MODULE_ALIAS("ip6t_state");
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;
enum ip_conntrack_info ctinfo;
unsigned int statebit;
@@
-44,56
+37,51
@@
match(const struct sk_buff *skb,
return (sinfo->statemask & statebit);
}
return (sinfo->statemask & statebit);
}
-static int 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=%
d\n",
match->family);
- return
0
;
+ "proto=%
u\n", par->
match->family);
+ return
false
;
}
}
- return
1
;
+ return
true
;
}
}
-static void
-destroy(const struct xt_match *match, void *matchinfo)
+static void state_mt_destroy(const struct xt_mtdtor_param *par)
{
{
- nf_ct_l3proto_module_put(match->family);
+ nf_ct_l3proto_module_put(
par->
match->family);
}
}
-static struct xt_match
xt_state_match[]
= {
+static struct xt_match
state_mt_reg[] __read_mostly
= {
{
.name = "state",
{
.name = "state",
- .family =
AF_INET
,
- .checkentry = check,
- .match =
match
,
- .destroy = destroy,
+ .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",
.matchsize = sizeof(struct xt_state_info),
.me = THIS_MODULE,
},
{
.name = "state",
- .family =
AF_INET
6,
- .checkentry = check,
- .match =
match
,
- .destroy = destroy,
+ .family =
NFPROTO_IPV
6,
+ .checkentry =
state_mt_
check,
+ .match =
state_mt
,
+ .destroy =
state_mt_
destroy,
.matchsize = sizeof(struct xt_state_info),
.me = THIS_MODULE,
},
};
.matchsize = sizeof(struct xt_state_info),
.me = THIS_MODULE,
},
};
-static int __init
xt_state
_init(void)
+static int __init
state_mt
_init(void)
{
{
- return xt_register_matches(
xt_state_match, ARRAY_SIZE(xt_state_match
));
+ return xt_register_matches(
state_mt_reg, ARRAY_SIZE(state_mt_reg
));
}
}
-static void __exit
xt_state_fini
(void)
+static void __exit
state_mt_exit
(void)
{
{
- xt_unregister_matches(
xt_state_match, ARRAY_SIZE(xt_state_match
));
+ xt_unregister_matches(
state_mt_reg, ARRAY_SIZE(state_mt_reg
));
}
}
-module_init(
xt_state
_init);
-module_exit(
xt_state_fini
);
+module_init(
state_mt
_init);
+module_exit(
state_mt_exit
);
This page took
0.030375 seconds
and
5
git commands to generate.