From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 04/21] netfilter: nf_osf: rename nf_osf.c to nfnetlink_osf.c
Date: Sun, 5 Aug 2018 23:21:24 +0200 [thread overview]
Message-ID: <20180805212141.3033-5-pablo@netfilter.org> (raw)
In-Reply-To: <20180805212141.3033-1-pablo@netfilter.org>
From: Fernando Fernandez Mancera <ffmancera@riseup.net>
Rename nf_osf.c to nfnetlink_osf.c as we introduce nfnetlink_osf which is
the OSF infraestructure.
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/Kconfig | 15 ++++++++++-----
net/netfilter/Makefile | 2 +-
net/netfilter/{nf_osf.c => nfnetlink_osf.c} | 0
3 files changed, 11 insertions(+), 6 deletions(-)
rename net/netfilter/{nf_osf.c => nfnetlink_osf.c} (100%)
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 6f6c959aeb8f..85333431e524 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -46,6 +46,14 @@ config NETFILTER_NETLINK_LOG
and is also scheduled to replace the old syslog-based ipt_LOG
and ip6t_LOG modules.
+config NETFILTER_NETLINK_OSF
+ tristate "Netfilter OSF over NFNETLINK interface"
+ depends on NETFILTER_ADVANCED
+ select NETFILTER_NETLINK
+ help
+ If this option is enabled, the kernel will include support
+ for passive OS fingerprint via NFNETLINK.
+
config NF_CONNTRACK
tristate "Netfilter connection tracking support"
default m if NETFILTER_ADVANCED=n
@@ -442,9 +450,6 @@ config NETFILTER_SYNPROXY
endif # NF_CONNTRACK
-config NF_OSF
- tristate
-
config NF_TABLES
select NETFILTER_NETLINK
tristate "Netfilter nf_tables support"
@@ -1368,8 +1373,8 @@ config NETFILTER_XT_MATCH_NFACCT
config NETFILTER_XT_MATCH_OSF
tristate '"osf" Passive OS fingerprint match'
- depends on NETFILTER_ADVANCED && NETFILTER_NETLINK
- select NF_OSF
+ depends on NETFILTER_ADVANCED
+ select NETFILTER_NETLINK_OSF
help
This option selects the Passive OS Fingerprinting match module
that allows to passively match the remote operating system by
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index dd26e4961f43..e684f9b8a9c3 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_NETFILTER_NETLINK) += nfnetlink.o
obj-$(CONFIG_NETFILTER_NETLINK_ACCT) += nfnetlink_acct.o
obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += nfnetlink_queue.o
obj-$(CONFIG_NETFILTER_NETLINK_LOG) += nfnetlink_log.o
+obj-$(CONFIG_NETFILTER_NETLINK_OSF) += nfnetlink_osf.o
# connection tracking
obj-$(CONFIG_NF_CONNTRACK) += nf_conntrack.o
@@ -108,7 +109,6 @@ obj-$(CONFIG_NFT_HASH) += nft_hash.o
obj-$(CONFIG_NFT_FIB) += nft_fib.o
obj-$(CONFIG_NFT_FIB_INET) += nft_fib_inet.o
obj-$(CONFIG_NFT_FIB_NETDEV) += nft_fib_netdev.o
-obj-$(CONFIG_NF_OSF) += nf_osf.o
obj-$(CONFIG_NFT_SOCKET) += nft_socket.o
# nf_tables netdev
diff --git a/net/netfilter/nf_osf.c b/net/netfilter/nfnetlink_osf.c
similarity index 100%
rename from net/netfilter/nf_osf.c
rename to net/netfilter/nfnetlink_osf.c
--
2.11.0
next prev parent reply other threads:[~2018-08-05 21:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-05 21:21 [PATCH 00/21] Netfilter updates for net-next Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 01/21] netfilter: nf_tables: handle meta/lookup with direct call Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 02/21] netfilter: nf_osf: add nf_osf_find() Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 03/21] netfilter: use PTR_ERR_OR_ZERO() Pablo Neira Ayuso
2018-08-05 21:21 ` Pablo Neira Ayuso [this message]
2018-08-05 21:21 ` [PATCH 05/21] netfilter: nfnetlink_osf: extract nfnetlink_subsystem code from xt_osf.c Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 06/21] netfilter: nf_tables: implement Passive OS fingerprint module in nft_osf Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 07/21] netfilter: nf_tables: Add native tproxy support Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 08/21] netfilter: use kvmalloc_array to allocate memory for hashtable Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 09/21] netfilter: nf_osf: move nf_osf_fingers to non-uapi header file Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 10/21] netfilter: nfnetlink_osf: rename nf_osf header file to nfnetlink_osf Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 11/21] netfilter: nf_tables: flow event notifier must use transaction mutex Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 12/21] netfilter: nf_tables: remove unused variable Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 13/21] netfilter: cttimeout: Make NF_CT_NETLINK_TIMEOUT depend on NF_CONNTRACK_TIMEOUT Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 14/21] netfilter: nft_tproxy: Add missing config check Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 15/21] netfilter: nf_tables: add tunnel support Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 16/21] netfilter: nf_tables: match on tunnel metadata Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 17/21] netfilter: bridge: Expose nf_tables bridge hook priorities through uapi Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 18/21] netfilter: nf_tables: simplify NLM_F_CREATE handling Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 19/21] netfilter: kconfig: remove ct zone/label dependencies Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 20/21] netfilter: conntrack: avoid use-after free on rmmod Pablo Neira Ayuso
2018-08-05 21:21 ` [PATCH 21/21] netfilter: nft_tunnel: fix sparse errors Pablo Neira Ayuso
2018-08-06 0:06 ` [PATCH 00/21] Netfilter updates for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180805212141.3033-5-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).