[nf-next,28/29] netfilter: add IP_SET_HASH config option.

Message ID	20190901205126.6935-29-jeremy@azazel.net
State	Changes Requested
Delegated to:	Pablo Neira
Headers	show Return-Path: <netfilter-devel-owner@vger.kernel.org> From: Jeremy Sowden <jeremy@azazel.net> To: Pablo Neira Ayuso <pablo@netfilter.org>, Jozsef Kadlecsik <kadlec@netfilter.org>, Florian Westphal <fw@strlen.de> Cc: Netfilter Devel <netfilter-devel@vger.kernel.org> Subject: [PATCH nf-next 28/29] netfilter: add IP_SET_HASH config option. Date: Sun, 1 Sep 2019 21:51:24 +0100 Message-Id: <20190901205126.6935-29-jeremy@azazel.net> In-Reply-To: <20190901205126.6935-1-jeremy@azazel.net> References: <20190901205126.6935-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk
Series	Add config option checks to netfilter headers. \| expand [nf-next,00/29] Add config option checks to netfilter headers. [nf-next,01/29] netfilter: add include guard to nf_conntrack_h323_types.h [nf-next,02/29] netfilter: add include guard to nf_conntrack_labels.h. [nf-next,03/29] netfilter: fix include guard comment. [nf-next,04/29] netfilter: add GPL-2.0 SPDX ID's to a couple of headers. [nf-next,05/29] netfilter: remove trailing white-space. [nf-next,06/29] netfilter: fix Kconfig formatting error. [nf-next,07/29] netfilter: remove stray semicolons. [nf-next,08/29] netfilter: remove unused function declarations. [nf-next,09/29] netfilter: remove unused includes. [nf-next,10/29] netfilter: include the right header in nf_conntrack_zones.h. [nf-next,11/29] netfilter: added missing includes. [nf-next,12/29] netfilter: inline three headers. [nf-next,13/29] netfilter: remove superfluous header. [nf-next,14/29] netfilter: move inline function to a more appropriate header. [nf-next,15/29] netfilter: move code between synproxy headers. [nf-next,16/29] netfilter: move struct definition function to a more appropriate header. [nf-next,17/29] netfilter: use consistent style when defining inline functions in nf_conntrack_ecac… [nf-next,18/29] netfilter: replace defined(CONFIG...) \|\| defined(CONFIG...MODULE) with IS_ENABLED(C… [nf-next,19/29] netfilter: wrap union nf_conntrack_proto members in CONFIG_NF_CT_PROTO_* check. [nf-next,20/29] netfilter: wrap inline synproxy function in CONFIG_NETFILTER_SYNPROXY check. [nf-next,21/29] netfilter: wrap inline timeout function in CONFIG_NETFILTER_TIMEOUT check. [nf-next,22/29] netfilter: wrap some nat-related conntrack code in a CONFIG_NF_NAT check. [nf-next,23/29] netfilter: wrap some ipv6 tables code in a CONFIG_NF_TABLES_IPV6 check. [nf-next,24/29] netfilter: wrap some conntrack code in a CONFIG_NF_CONNTRACK check. [nf-next,25/29] netfilter: add CONFIG_NETFILTER check to linux/netfilter.h. [nf-next,26/29] netfilter: add NF_TPROXY config option. [nf-next,27/29] netfilter: add IP_SET_BITMAP config option. [nf-next,28/29] netfilter: add IP_SET_HASH config option. [nf-next,29/29] netfilter: wrap headers in CONFIG checks.

Message ID

20190901205126.6935-29-jeremy@azazel.net

State

Changes Requested

Delegated to:

Pablo Neira

Headers

From: Jeremy Sowden <jeremy@azazel.net>
To: Pablo Neira Ayuso <pablo@netfilter.org>,
	Jozsef Kadlecsik <kadlec@netfilter.org>, Florian Westphal <fw@strlen.de>
Cc: Netfilter Devel <netfilter-devel@vger.kernel.org>
Subject: [PATCH nf-next 28/29] netfilter: add IP_SET_HASH config option.
Date: Sun,  1 Sep 2019 21:51:24 +0100
Message-Id: <20190901205126.6935-29-jeremy@azazel.net>
In-Reply-To: <20190901205126.6935-1-jeremy@azazel.net>
References: <20190901205126.6935-1-jeremy@azazel.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: netfilter-devel-owner@vger.kernel.org
Precedence: bulk

Series

Add config option checks to netfilter headers. | expand

Commit Message

Jeremy Sowden Sept. 1, 2019, 8:51 p.m. UTC

Add a hidden tristate option which is selected by all the IP_SET_HASH_*
options.  It will be used to wrap ip_set_hash.h.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 net/netfilter/ipset/Kconfig | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/net/netfilter/ipset/Kconfig b/net/netfilter/ipset/Kconfig
index 8a5498a86df0..56b95e859043 100644
--- a/net/netfilter/ipset/Kconfig
+++ b/net/netfilter/ipset/Kconfig
@@ -58,9 +58,13 @@  config IP_SET_BITMAP_PORT
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
+config IP_SET_HASH
+	tristate
+
 config IP_SET_HASH_IP
 	tristate "hash:ip set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:ip set type support, by which one
 	  can store arbitrary IPv4 or IPv6 addresses (or network addresses)
@@ -71,6 +75,7 @@  config IP_SET_HASH_IP
 config IP_SET_HASH_IPMARK
 	tristate "hash:ip,mark set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:ip,mark set type support, by which one
 	  can store IPv4/IPv6 address and mark pairs.
@@ -80,6 +85,7 @@  config IP_SET_HASH_IPMARK
 config IP_SET_HASH_IPPORT
 	tristate "hash:ip,port set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:ip,port set type support, by which one
 	  can store IPv4/IPv6 address and protocol/port pairs.
@@ -89,6 +95,7 @@  config IP_SET_HASH_IPPORT
 config IP_SET_HASH_IPPORTIP
 	tristate "hash:ip,port,ip set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:ip,port,ip set type support, by which
 	  one can store IPv4/IPv6 address, protocol/port, and IPv4/IPv6
@@ -99,6 +106,7 @@  config IP_SET_HASH_IPPORTIP
 config IP_SET_HASH_IPPORTNET
 	tristate "hash:ip,port,net set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:ip,port,net set type support, by which
 	  one can store IPv4/IPv6 address, protocol/port, and IPv4/IPv6
@@ -109,6 +117,7 @@  config IP_SET_HASH_IPPORTNET
 config IP_SET_HASH_IPMAC
 	tristate "hash:ip,mac set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:ip,mac set type support, by which
 	  one can store IPv4/IPv6 address and MAC (ethernet address) pairs in a set.
@@ -118,6 +127,7 @@  config IP_SET_HASH_IPMAC
 config IP_SET_HASH_MAC
 	tristate "hash:mac set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:mac set type support, by which
 	  one can store MAC (ethernet address) elements in a set.
@@ -127,6 +137,7 @@  config IP_SET_HASH_MAC
 config IP_SET_HASH_NETPORTNET
 	tristate "hash:net,port,net set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:net,port,net set type support, by which
 	  one can store two IPv4/IPv6 subnets, and a protocol/port in a set.
@@ -136,6 +147,7 @@  config IP_SET_HASH_NETPORTNET
 config IP_SET_HASH_NET
 	tristate "hash:net set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:net set type support, by which
 	  one can store IPv4/IPv6 network address/prefix elements in a set.
@@ -145,6 +157,7 @@  config IP_SET_HASH_NET
 config IP_SET_HASH_NETNET
 	tristate "hash:net,net set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:net,net  set type support, by which
 	  one can store IPv4/IPv6 network address/prefix pairs in a set.
@@ -154,6 +167,7 @@  config IP_SET_HASH_NETNET
 config IP_SET_HASH_NETPORT
 	tristate "hash:net,port set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:net,port set type support, by which
 	  one can store IPv4/IPv6 network address/prefix and
@@ -164,6 +178,7 @@  config IP_SET_HASH_NETPORT
 config IP_SET_HASH_NETIFACE
 	tristate "hash:net,iface set support"
 	depends on IP_SET
+	select IP_SET_HASH
 	help
 	  This option adds the hash:net,iface set type support, by which
 	  one can store IPv4/IPv6 network address/prefix and

[nf-next,28/29] netfilter: add IP_SET_HASH config option.

Commit Message

Patch