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

Commit f6b7b5f4 authored by Fernando Fernandez Mancera's avatar Fernando Fernandez Mancera Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_osf: rename nf_osf.c to nfnetlink_osf.c 



Rename nf_osf.c to nfnetlink_osf.c as we introduce nfnetlink_osf which is
the OSF infraestructure.

Signed-off-by: default avatarFernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 33b78aaa

net/netfilter/Kconfig

+10 −5
Original line number Original line Diff line number Diff line
@@ -46,6 +46,14 @@ config NETFILTER_NETLINK_LOG 
	  and is also scheduled to replace the old syslog-based ipt_LOG

	  and is also scheduled to replace the old syslog-based ipt_LOG

	  and ip6t_LOG modules.

	  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

config NF_CONNTRACK

	tristate "Netfilter connection tracking support"

	tristate "Netfilter connection tracking support"

	default m if NETFILTER_ADVANCED=n

	default m if NETFILTER_ADVANCED=n
@@ -442,9 +450,6 @@ config NETFILTER_SYNPROXY 




endif # NF_CONNTRACK

endif # NF_CONNTRACK





config NF_OSF

	tristate



config NF_TABLES

config NF_TABLES

	select NETFILTER_NETLINK

	select NETFILTER_NETLINK

	tristate "Netfilter nf_tables support"

	tristate "Netfilter nf_tables support"
@@ -1368,8 +1373,8 @@ config NETFILTER_XT_MATCH_NFACCT 




config NETFILTER_XT_MATCH_OSF

config NETFILTER_XT_MATCH_OSF

	tristate '"osf" Passive OS fingerprint match'

	tristate '"osf" Passive OS fingerprint match'

	depends on NETFILTER_ADVANCED && NETFILTER_NETLINK

	depends on NETFILTER_ADVANCED

	select NF_OSF

	select NETFILTER_NETLINK_OSF

	help

	help

	  This option selects the Passive OS Fingerprinting match module

	  This option selects the Passive OS Fingerprinting match module

	  that allows to passively match the remote operating system by

	  that allows to passively match the remote operating system by

net/netfilter/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_NETFILTER_NETLINK) += nfnetlink.o 
obj-$(CONFIG_NETFILTER_NETLINK_ACCT) += nfnetlink_acct.o

obj-$(CONFIG_NETFILTER_NETLINK_ACCT) += nfnetlink_acct.o

obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += nfnetlink_queue.o

obj-$(CONFIG_NETFILTER_NETLINK_QUEUE) += nfnetlink_queue.o

obj-$(CONFIG_NETFILTER_NETLINK_LOG) += nfnetlink_log.o

obj-$(CONFIG_NETFILTER_NETLINK_LOG) += nfnetlink_log.o

obj-$(CONFIG_NETFILTER_NETLINK_OSF) += nfnetlink_osf.o





# connection tracking

# connection tracking

obj-$(CONFIG_NF_CONNTRACK) += nf_conntrack.o

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)		+= nft_fib.o

obj-$(CONFIG_NFT_FIB_INET)	+= nft_fib_inet.o

obj-$(CONFIG_NFT_FIB_INET)	+= nft_fib_inet.o

obj-$(CONFIG_NFT_FIB_NETDEV)	+= nft_fib_netdev.o

obj-$(CONFIG_NFT_FIB_NETDEV)	+= nft_fib_netdev.o

obj-$(CONFIG_NF_OSF)		+= nf_osf.o

obj-$(CONFIG_NFT_SOCKET)	+= nft_socket.o

obj-$(CONFIG_NFT_SOCKET)	+= nft_socket.o





# nf_tables netdev

# nf_tables netdev

net/netfilter/nf_osf.c→net/netfilter/nfnetlink_osf.c

+0 −0

File moved.

View file