Skip to content

Commit

Permalink
netfilter: Add nf_hook_state initializer function.
Browse files Browse the repository at this point in the history
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: David S. Miller <davem@davemloft.net>
  • Loading branch information
David Miller committed Apr 7, 2015
1 parent a3786a5 commit 107a9f4
Showing 1 changed file with 18 additions and 8 deletions.
26 changes: 18 additions & 8 deletions include/linux/netfilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,21 @@ struct nf_hook_state {
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,
struct sk_buff *skb,
const struct nf_hook_state *state);
Expand Down Expand Up @@ -142,15 +157,10 @@ static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,
int (*okfn)(struct sk_buff *), int thresh)
{
if (nf_hooks_active(pf, hook)) {
struct nf_hook_state state = {
.hook = hook,
.thresh = thresh,
.pf = pf,
.in = indev,
.out = outdev,
.okfn = okfn
};
struct nf_hook_state state;

nf_hook_state_init(&state, hook, thresh, pf,
indev, outdev, okfn);
return nf_hook_slow(skb, &state);
}
return 1;
Expand Down

0 comments on commit 107a9f4

Please sign in to comment.