Skip to content

Commit

Permalink
netfilter: add nf_hook_list_active()
Browse files Browse the repository at this point in the history
In preparation to have netfilter ingress per-device hook list.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pablo Neira authored and David S. Miller committed May 14, 2015
1 parent f719148 commit b8d0aad
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions include/linux/netfilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,26 +134,33 @@ extern struct list_head nf_hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
#ifdef HAVE_JUMP_LABEL
extern struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS];

static inline bool nf_hooks_active(u_int8_t pf, unsigned int hook)
static inline bool nf_hook_list_active(struct list_head *nf_hook_list,
u_int8_t pf, unsigned int hook)
{
if (__builtin_constant_p(pf) &&
__builtin_constant_p(hook))
return static_key_false(&nf_hooks_needed[pf][hook]);

return !list_empty(&nf_hooks[pf][hook]);
return !list_empty(nf_hook_list);
}
#else
static inline bool nf_hooks_active(u_int8_t pf, unsigned int hook)
static inline bool nf_hook_list_active(struct list_head *nf_hook_list,
u_int8_t pf, unsigned int hook)
{
return !list_empty(&nf_hooks[pf][hook]);
return !list_empty(nf_hook_list);
}
#endif

static inline bool nf_hooks_active(u_int8_t pf, unsigned int hook)
{
return nf_hook_list_active(&nf_hooks[pf][hook], pf, hook);
}

int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state);

/**
* nf_hook_thresh - call a netfilter hook
*
*
* Returns 1 if the hook has allowed the packet to pass. The function
* okfn must be invoked by the caller in this case. Any other return
* value indicates the packet has been consumed by the hook.
Expand Down

0 comments on commit b8d0aad

Please sign in to comment.