提交 107a9f4d 编写于 作者: D David Miller 提交者: David S. Miller

netfilter: Add nf_hook_state initializer function.

This way we can consolidate where we setup new nf_hook_state objects,
to make sure the entire thing is initialized.

The only other place an nf_hook_object is instantiated is nf_queue,
wherein a structure copy is used.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 a3786a5f
...@@ -54,6 +54,21 @@ struct nf_hook_state { ...@@ -54,6 +54,21 @@ struct nf_hook_state {
int (*okfn)(struct sk_buff *); int (*okfn)(struct sk_buff *);
}; };
static inline void nf_hook_state_init(struct nf_hook_state *p,
unsigned int hook,
int thresh, u_int8_t pf,
struct net_device *indev,
struct net_device *outdev,
int (*okfn)(struct sk_buff *))
{
p->hook = hook;
p->thresh = thresh;
p->pf = pf;
p->in = indev;
p->out = outdev;
p->okfn = okfn;
}
typedef unsigned int nf_hookfn(const struct nf_hook_ops *ops, typedef unsigned int nf_hookfn(const struct nf_hook_ops *ops,
struct sk_buff *skb, struct sk_buff *skb,
const struct nf_hook_state *state); const struct nf_hook_state *state);
...@@ -142,15 +157,10 @@ static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook, ...@@ -142,15 +157,10 @@ static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,
int (*okfn)(struct sk_buff *), int thresh) int (*okfn)(struct sk_buff *), int thresh)
{ {
if (nf_hooks_active(pf, hook)) { if (nf_hooks_active(pf, hook)) {
struct nf_hook_state state = { struct nf_hook_state state;
.hook = hook,
.thresh = thresh,
.pf = pf,
.in = indev,
.out = outdev,
.okfn = okfn
};
nf_hook_state_init(&state, hook, thresh, pf,
indev, outdev, okfn);
return nf_hook_slow(skb, &state); return nf_hook_slow(skb, &state);
} }
return 1; return 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册