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

Commit 6e23ae2a authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: Introduce NF_INET_ hook values 



The IPv4 and IPv6 hook values are identical, yet some code tries to figure
out the "correct" value by looking at the address family. Introduce NF_INET_*
values for both IPv4 and IPv6. The old values are kept in a #ifndef __KERNEL__
section for userspace compatibility.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Acked-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1bf06cd2

include/linux/netfilter.h

+9 −0
Original line number Diff line number Diff line
@@ -39,6 +39,15 @@ 
#define NFC_ALTERED 0x8000

#endif



enum nf_inet_hooks {

	NF_INET_PRE_ROUTING,

	NF_INET_LOCAL_IN,

	NF_INET_FORWARD,

	NF_INET_LOCAL_OUT,

	NF_INET_POST_ROUTING,

	NF_INET_NUMHOOKS

};



#ifdef __KERNEL__

#ifdef CONFIG_NETFILTER

include/linux/netfilter/x_tables.h

+2 −2
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ struct xt_table_info 
	unsigned int initial_entries;



	/* Entry points and underflows */

	unsigned int hook_entry[NF_IP_NUMHOOKS];

	unsigned int underflow[NF_IP_NUMHOOKS];

	unsigned int hook_entry[NF_INET_NUMHOOKS];

	unsigned int underflow[NF_INET_NUMHOOKS];



	/* ipt_entry tables: one per CPU */

	char *entries[NR_CPUS];

include/linux/netfilter_ipv4.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#define NFC_IP_DST_PT		0x0400

/* Something else about the proto */

#define NFC_IP_PROTO_UNKNOWN	0x2000

#endif /* ! __KERNEL__ */



/* IP Hooks */

/* After promisc drops, checksum checks. */
@@ -50,6 +49,7 @@ 
/* Packets about to hit the wire. */

#define NF_IP_POST_ROUTING	4

#define NF_IP_NUMHOOKS		5

#endif /* ! __KERNEL__ */



enum nf_ip_hook_priorities {

	NF_IP_PRI_FIRST = INT_MIN,

include/linux/netfilter_ipv4/ip_tables.h

+4 −4
Original line number Diff line number Diff line
@@ -156,10 +156,10 @@ struct ipt_getinfo 
	unsigned int valid_hooks;



	/* Hook entry points: one per netfilter hook. */

	unsigned int hook_entry[NF_IP_NUMHOOKS];

	unsigned int hook_entry[NF_INET_NUMHOOKS];



	/* Underflow points. */

	unsigned int underflow[NF_IP_NUMHOOKS];

	unsigned int underflow[NF_INET_NUMHOOKS];



	/* Number of entries */

	unsigned int num_entries;
@@ -185,10 +185,10 @@ struct ipt_replace 
	unsigned int size;



	/* Hook entry points. */

	unsigned int hook_entry[NF_IP_NUMHOOKS];

	unsigned int hook_entry[NF_INET_NUMHOOKS];



	/* Underflow points. */

	unsigned int underflow[NF_IP_NUMHOOKS];

	unsigned int underflow[NF_INET_NUMHOOKS];



	/* Information about old entries: */

	/* Number of counters (must be equal to current number of entries). */

include/linux/netfilter_ipv6.h

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ 
#define NFC_IP6_DST_PT           0x0400

/* Something else about the proto */

#define NFC_IP6_PROTO_UNKNOWN    0x2000

#endif /* ! __KERNEL__ */





/* IP6 Hooks */

/* After promisc drops, checksum checks. */
@@ -55,6 +53,7 @@ 
/* Packets about to hit the wire. */

#define NF_IP6_POST_ROUTING	4

#define NF_IP6_NUMHOOKS		5

#endif /* ! __KERNEL__ */





enum nf_ip6_hook_priorities {