Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 107a9f4d authored by David Miller's avatar David Miller Committed by David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent a3786a5f

include/linux/netfilter.h

+18 −8
Original line number Diff line number Diff line
@@ -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);
@@ -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;