netfilter: masquerade: unify ip/ip6 notifier registration
Subsystems (2)
Florian Westphal
maintainercover netfilter: masquerade: unify ip/ip6 notifier registration
This series merges the ip/ip6 masquerade helpers.
The xtables masquerade modules are merged into a single module.
Florian Westphal (3):
netfilter: nf_nat: merge ip/ip6 masquerade headers
netfilter: x_tables: merge ip and ipv6 masquerade modules
netfilter: nf_nat_masquerade: unify ipv4/6 notifier registration
include/net/netfilter/nf_nat_masquerade.h | 19 ++++ net/ipv4/netfilter/Kconfig | 12 -- net/ipv4/netfilter/Makefile | 1 net/ipv6/netfilter/Kconfig | 11 -- net/ipv6/netfilter/Makefile | 1 net/netfilter/Kconfig | 14 +++ net/netfilter/Makefile | 1 net/netfilter/nf_nat_masquerade.c | 104 +++++++++---------------- net/netfilter/nft_masq.c | 19 ---- net/netfilter/xt_MASQUERADE.c | 84 +++++++++++++------- include/net/netfilter/ipv4/nf_nat_masquerade.h | 15 --- include/net/netfilter/ipv6/nf_nat_masquerade.h | 11 -- net/ipv6/netfilter/ip6t_MASQUERADE.c | 81 ------------------- 13 files changed, 139 insertions(+), 234 deletions(-)
Florian Westphal
maintainerPATCH 1/3 netfilter: nf_nat: merge ip/ip6 masquerade headers
Both are now implemented by nf_nat_masquerade.c, so no need to keep different headers.
---
include/net/netfilter/ipv6/nf_nat_masquerade.h | 11 -----------
include/net/netfilter/{ipv4 => }/nf_nat_masquerade.h | 12 +++++++++---
net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +-
net/ipv6/netfilter/ip6t_MASQUERADE.c | 2 +-
net/netfilter/nf_nat_masquerade.c | 3 +--
net/netfilter/nft_masq.c | 3 +--
6 files changed, 13 insertions(+), 20 deletions(-)
delete mode 100644 include/net/netfilter/ipv6/nf_nat_masquerade.h
rename include/net/netfilter/{ipv4 => }/nf_nat_masquerade.h (50%)include/net/netfilter/ipv6/nf_nat_masquerade.h deleted +0 -11
@@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _NF_NAT_MASQUERADE_IPV6_H_ -#define _NF_NAT_MASQUERADE_IPV6_H_ - -unsigned int -nf_nat_masquerade_ipv6 (struct sk_buff *skb,const struct nf_nat_range2 *range, -const struct net_device *out); -int nf_nat_masquerade_ipv6_register_notifier (void ); -void nf_nat_masquerade_ipv6_unregister_notifier (void ); - -#endif /* _NF_NAT_MASQUERADE_IPV6_H_ */
include/net/netfilter/nf_nat_masquerade.h renamed from include/net/netfilter/ipv4/nf_nat_masquerade.h +9 -3
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _NF_NAT_MASQUERADE_IPV4_H_ -#define _NF_NAT_MASQUERADE_IPV4_H_ +#ifndef _NF_NAT_MASQUERADE_H_ +#define _NF_NAT_MASQUERADE_H_#include <net/netfilter/nf_nat.h>
@@ -12,4 +12,10 @@ nf_nat_masquerade_ipv4(struct sk_buff *skb, unsigned int hooknum,int nf_nat_masquerade_ipv4_register_notifier (void );void nf_nat_masquerade_ipv4_unregister_notifier (void ); -#endif /*_NF_NAT_MASQUERADE_IPV4_H_ */ +unsigned int +nf_nat_masquerade_ipv6 (struct sk_buff *skb,const struct nf_nat_range2 *range, +const struct net_device *out); +int nf_nat_masquerade_ipv6_register_notifier (void ); +void nf_nat_masquerade_ipv6_unregister_notifier (void ); + +#endif /*_NF_NAT_MASQUERADE_H_ */
net/ipv4/netfilter/ipt_MASQUERADE.c +1 -1
@@ -22,7 +22,7 @@#include <linux/netfilter_ipv4.h> #include <linux/netfilter/x_tables.h> #include <net/netfilter/nf_nat.h> -#include <net/netfilter/ipv4/nf_nat_masquerade.h> +#include <net/netfilter/nf_nat_masquerade.h> MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Netfilter Core Team <[email protected]>" );
net/ipv6/netfilter/ip6t_MASQUERADE.c +1 -1
@@ -19,7 +19,7 @@#include <net/netfilter/nf_nat.h> #include <net/addrconf.h> #include <net/ipv6.h> -#include <net/netfilter/ipv6/nf_nat_masquerade.h> +#include <net/netfilter/nf_nat_masquerade.h> static unsigned int masquerade_tg6 (struct sk_buff *skb,const struct xt_action_param *par)
net/netfilter/nf_nat_masquerade.c +1 -2
@@ -7,8 +7,7 @@#include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv6.h> -#include <net/netfilter/ipv4/nf_nat_masquerade.h> -#include <net/netfilter/ipv6/nf_nat_masquerade.h> +#include <net/netfilter/nf_nat_masquerade.h> static DEFINE_MUTEX (masq_mutex);static unsigned int masq_refcnt4__read_mostly ;
net/netfilter/nft_masq.c +1 -2
@@ -14,8 +14,7 @@#include <linux/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_nat.h> -#include <net/netfilter/ipv4/nf_nat_masquerade.h> -#include <net/netfilter/ipv6/nf_nat_masquerade.h> +#include <net/netfilter/nf_nat_masquerade.h> struct nft_masq {u32 flags;
Signature · 1 line
2.21.0
Florian Westphal
maintainerPATCH 2/3 netfilter: x_tables: merge ip and ipv6 masquerade modules
In reply to Florian WestphalNo need to have separate modules for this.
before:
text data bss dec filename 2038 1168 0 3206 net/ipv4/netfilter/ipt_MASQUERADE.ko 1526 1024 0 2550 net/ipv6/netfilter/ip6t_MASQUERADE.ko after: text data bss dec filename 2521 1296 0 3817 net/netfilter/xt_MASQUERADE.ko
---
net/ipv4/netfilter/Kconfig | 12 +--
net/ipv4/netfilter/Makefile | 1 -
net/ipv6/netfilter/Kconfig | 11 +--
net/ipv6/netfilter/Makefile | 1 -
net/ipv6/netfilter/ip6t_MASQUERADE.c | 81 -----------------
net/netfilter/Kconfig | 14 +++
net/netfilter/Makefile | 1 +
.../xt_MASQUERADE.c} | 90 ++++++++++++++-----
8 files changed, 87 insertions(+), 124 deletions(-)
delete mode 100644 net/ipv6/netfilter/ip6t_MASQUERADE.c
rename net/{ipv4/netfilter/ipt_MASQUERADE.c => netfilter/xt_MASQUERADE.c} (51%)net/ipv4/netfilter/Kconfig +3 -9
@@ -224,16 +224,10 @@ if IP_NF_NAT config IP_NF_TARGET_MASQUERADE tristate "MASQUERADE target support" - select NF_NAT_MASQUERADE - default m if NETFILTER_ADVANCED=n + select NETFILTER_XT_TARGET_MASQUERADE help - Masquerading is a special case of NAT: all outgoing connections are - changed to seem to come from a particular interface's address, and - if the interface goes down, those connections are lost. This is - only useful for dialup accounts with dynamic IP address (ie. your IP - address will be different on next dialup). - - To compile it as a module, choose M here. If unsure, say N. + This is a backwards-compat option for the user's convenience + (e.g. when running oldconfig). It selects NETFILTER_XT_TARGET_MASQUERADE. config IP_NF_TARGET_NETMAP tristate "NETMAP target support"
net/ipv4/netfilter/Makefile +0 -1
@@ -48,7 +48,6 @@ obj-$(CONFIG_IP_NF_MATCH_RPFILTER) += ipt_rpfilter.o # targets obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o -obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o obj-$(CONFIG_IP_NF_TARGET_SYNPROXY) += ipt_SYNPROXY.o
net/ipv6/netfilter/Kconfig +3 -8
@@ -270,15 +270,10 @@ if IP6_NF_NAT config IP6_NF_TARGET_MASQUERADE tristate "MASQUERADE target support" - select NF_NAT_MASQUERADE + select NETFILTER_XT_TARGET_MASQUERADE help - Masquerading is a special case of NAT: all outgoing connections are - changed to seem to come from a particular interface's address, and - if the interface goes down, those connections are lost. This is - only useful for dialup accounts with dynamic IP address (ie. your IP - address will be different on next dialup). - - To compile it as a module, choose M here. If unsure, say N. + This is a backwards-compat option for the user's convenience + (e.g. when running oldconfig). It selects NETFILTER_XT_TARGET_MASQUERADE. config IP6_NF_TARGET_NPT tristate "NPT (Network Prefix translation) target support"
net/ipv6/netfilter/Makefile +0 -1
@@ -46,7 +46,6 @@ obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt.o obj-$(CONFIG_IP6_NF_MATCH_SRH) += ip6t_srh.o # targets -obj-$(CONFIG_IP6_NF_TARGET_MASQUERADE) += ip6t_MASQUERADE.o obj-$(CONFIG_IP6_NF_TARGET_NPT) += ip6t_NPT.o obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o obj-$(CONFIG_IP6_NF_TARGET_SYNPROXY) += ip6t_SYNPROXY.o
net/ipv6/netfilter/ip6t_MASQUERADE.c deleted +0 -81
81 lines not on this page · raw message
net/netfilter/Kconfig +14 -0
@@ -997,6 +997,20 @@ config NETFILTER_XT_TARGET_REDIRECT To compile it as a module, choose M here. If unsure, say N. +config NETFILTER_XT_TARGET_MASQUERADE + tristate "MASQUERADE target support" + depends on NF_NAT + default m if NETFILTER_ADVANCED=n + select NF_NAT_MASQUERADE + help + Masquerading is a special case of NAT: all outgoing connections are + changed to seem to come from a particular interface's address, and + if the interface goes down, those connections are lost. This is + only useful for dialup accounts with dynamic IP address (ie. your IP + address will be different on next dialup). + + To compile it as a module, choose M here. If unsure, say N. + config NETFILTER_XT_TARGET_TEE tristate '"TEE" - packet cloning to alternate destination' depends on NETFILTER_ADVANCED
net/netfilter/Makefile +1 -0
@@ -148,6 +148,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o obj-$(CONFIG_NETFILTER_XT_TARGET_REDIRECT) += xt_REDIRECT.o +obj-$(CONFIG_NETFILTER_XT_TARGET_MASQUERADE) += xt_MASQUERADE.o obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o obj-$(CONFIG_NETFILTER_XT_TARGET_TPROXY) += xt_TPROXY.o obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
net/netfilter/xt_MASQUERADE.c renamed from net/ipv4/netfilter/ipt_MASQUERADE.c +66 -24
121 lines not on this page · raw message
Signature · 1 line
2.21.0
Florian Westphal
maintainerPATCH 3/3 netfilter: nf_nat_masquerade: unify ipv4/6 notifier registration
In reply to Florian WestphalOnly reason for having two different register functions was because of ipt_MASQUERADE and ip6t_MASQUERADE being two different modules.
Previous patch merged those into xt_MASQUERADE, so we can merge this too.
--- include/net/netfilter/nf_nat_masquerade.h | 6 +- net/netfilter/nf_nat_masquerade.c | 101 ++++++++-------------- net/netfilter/nft_masq.c | 16 +--- net/netfilter/xt_MASQUERADE.c | 16 +--- 4 files changed, 44 insertions(+), 95 deletions(-)
include/net/netfilter/nf_nat_masquerade.h +2 -4
@@ -9,13 +9,11 @@ nf_nat_masquerade_ipv4(struct sk_buff *skb, unsigned int hooknum,const struct nf_nat_range2 *range, const struct net_device *out); -int nf_nat_masquerade_ipv4_register_notifier (void ); -void nf_nat_masquerade_ipv4_unregister_notifier (void ); +int nf_nat_masquerade_inet_register_notifiers (void ); +void nf_nat_masquerade_inet_unregister_notifiers (void );unsigned int nf_nat_masquerade_ipv6 (struct sk_buff *skb,const struct nf_nat_range2 *range,const struct net_device *out); -int nf_nat_masquerade_ipv6_register_notifier (void ); -void nf_nat_masquerade_ipv6_unregister_notifier (void );#endif /*_NF_NAT_MASQUERADE_H_ */
net/netfilter/nf_nat_masquerade.c +37 -64
145 lines not on this page · raw message
net/netfilter/nft_masq.c +3 -13
@@ -195,22 +195,12 @@ static struct nft_expr_type nft_masq_ipv6_type __read_mostly = {static int __init nft_masq_module_init_ipv6 (void ) { -int ret =nft_register_expr (&nft_masq_ipv6_type); - -if (ret) -return ret; - - ret =nf_nat_masquerade_ipv6_register_notifier (); -if (ret <0 ) -nft_unregister_expr (&nft_masq_ipv6_type); - -return ret; +return nft_register_expr (&nft_masq_ipv6_type); }static void nft_masq_module_exit_ipv6 (void ) {nft_unregister_expr (&nft_masq_ipv6_type); -nf_nat_masquerade_ipv6_unregister_notifier (); }#else static inline int nft_masq_module_init_ipv6 (void ) {return 0 ; }
@@ -293,7 +283,7 @@ static int __init nft_masq_module_init(void)return ret; } - ret =nf_nat_masquerade_ipv4_register_notifier (); + ret =nf_nat_masquerade_inet_register_notifiers ();if (ret <0 ) {nft_masq_module_exit_ipv6 ();nft_masq_module_exit_inet ();
@@ -309,7 +299,7 @@ static void __exit nft_masq_module_exit(void)nft_masq_module_exit_ipv6 ();nft_masq_module_exit_inet ();nft_unregister_expr (&nft_masq_ipv4_type); -nf_nat_masquerade_ipv4_unregister_notifier (); +nf_nat_masquerade_inet_unregister_notifiers (); }module_init (nft_masq_module_init);
net/netfilter/xt_MASQUERADE.c +2 -14
@@ -107,32 +107,20 @@ static int __init masquerade_tg_init(void)if (ret)return ret; - ret =nf_nat_masquerade_ipv4_register_notifier (); + ret =nf_nat_masquerade_inet_register_notifiers ();if (ret) {xt_unregister_targets (masquerade_tg_reg,ARRAY_SIZE (masquerade_tg_reg));return ret; } -#if IS_ENABLED (CONFIG_IPV6 ) - ret =nf_nat_masquerade_ipv6_register_notifier (); -if (ret) { -xt_unregister_targets (masquerade_tg_reg, -ARRAY_SIZE (masquerade_tg_reg)); -nf_nat_masquerade_ipv4_unregister_notifier (); -return ret; - } -#endif return ret; } static void __exit masquerade_tg_exit(void) {xt_unregister_targets (masquerade_tg_reg,ARRAY_SIZE (masquerade_tg_reg)); -nf_nat_masquerade_ipv4_unregister_notifier (); -#if IS_ENABLED (CONFIG_IPV6 ) -nf_nat_masquerade_ipv6_unregister_notifier (); -#endif +nf_nat_masquerade_inet_unregister_notifiers (); }module_init (masquerade_tg_init);
Signature · 1 line
2.21.0
Quoted 2 lines · Florian Westphal
This series merges the ip/ip6 masquerade helpers.
The xtables masquerade modules are merged into a single module.
Applied.