Skip to content

Commit

Permalink
netfilter: add defines for arp/decnet max hooks
Browse files Browse the repository at this point in the history
The kernel already has defines for this, but they are in uapi exposed
headers.

Including these from netns.h causes build errors and also adds unneeded
dependencies on heads that we don't need.

So move these defines to netfilter_defs.h and place the uapi ones
in ifndef __KERNEL__ to keep them for userspace.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Florian Westphal authored and ummakynes committed Jan 8, 2018
1 parent b0f3833 commit e58f33c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
6 changes: 6 additions & 0 deletions include/linux/netfilter_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,10 @@
/* Largest hook number + 1, see uapi/linux/netfilter_decnet.h */
#define NF_MAX_HOOKS 8

/* in/out/forward only */
#define NF_ARP_NUMHOOKS 3

/* max hook is NF_DN_ROUTE (6), also see uapi/linux/netfilter_decnet.h */
#define NF_DN_NUMHOOKS 7

#endif
3 changes: 3 additions & 0 deletions include/uapi/linux/netfilter_arp.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
#define NF_ARP_IN 0
#define NF_ARP_OUT 1
#define NF_ARP_FORWARD 2

#ifndef __KERNEL__
#define NF_ARP_NUMHOOKS 3
#endif

#endif /* __LINUX_ARP_NETFILTER_H */
4 changes: 3 additions & 1 deletion include/uapi/linux/netfilter_decnet.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
#define NFC_DN_IF_IN 0x0004
/* Output device. */
#define NFC_DN_IF_OUT 0x0008

/* kernel define is in netfilter_defs.h */
#define NF_DN_NUMHOOKS 7
#endif /* ! __KERNEL__ */

/* DECnet Hooks */
Expand All @@ -41,7 +44,6 @@
#define NF_DN_HELLO 5
/* Input Routing Packets */
#define NF_DN_ROUTE 6
#define NF_DN_NUMHOOKS 7

enum nf_dn_hook_priorities {
NF_DN_PRI_FIRST = INT_MIN,
Expand Down

0 comments on commit e58f33c

Please sign in to comment.