netfilter: nf_tables: add new nft_masq expression
Subsystems (2)
PATCH 1/1 netfilter: nf_tables: add new nft_masq expression
The nft_masq expression is intended to perform NAT in the masquerade flavour.
We decided to have the masquerade functionality in a separated expression other than nft_nat.
Signed-off-by Arturo Borrero Gonzalez <[email protected]>
---
Note: this patch applies on top of the previously sent series regarding masquerade.
include/net/netfilter/nft_masq.h | 16 +++++ include/uapi/linux/netfilter/nf_tables.h | 12 ++++ net/ipv4/netfilter/Kconfig | 6 ++ net/ipv4/netfilter/Makefile | 1 net/ipv4/netfilter/nft_masq_ipv4.c | 92 ++++++++++++++++++++++++++++++ net/ipv6/netfilter/Kconfig | 6 ++ net/ipv6/netfilter/Makefile | 1 net/ipv6/netfilter/nft_masq_ipv6.c | 92 ++++++++++++++++++++++++++++++ net/netfilter/Kconfig | 9 +++ net/netfilter/Makefile | 1 net/netfilter/nft_masq.c | 60 ++++++++++++++++++++ 11 files changed, 296 insertions(+) create mode 100644 include/net/netfilter/nft_masq.h create mode 100644 net/ipv4/netfilter/nft_masq_ipv4.c create mode 100644 net/ipv6/netfilter/nft_masq_ipv6.c create mode 100644 net/netfilter/nft_masq.c
include/net/netfilter/nft_masq.h new file +16 -0
@@ -0,0 +1,16 @@ +#ifndef _NFT_MASQ_H_ +#define _NFT_MASQ_H_ + +struct nft_masq { +u32 flags; +}; + +extern const struct nla_policy nft_masq_policy[]; + +int nft_masq_init (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nlattr *const tb[]); + +int nft_masq_dump (struct sk_buff *skb,const struct nft_expr *expr); + +#endif /* _NFT_MASQ_H_ */
include/uapi/linux/netfilter/nf_tables.h +12 -0
@@ -800,4 +800,16 @@ enum nft_nat_attributes { };#define NFTA_NAT_MAX (__NFTA_NAT_MAX - 1) +/** +* enum nft_masq_attributes - nf_tables masquerade expression attributes +* +* @NFTA_MASQ_FLAGS: additional masquerade configuration (NF_NAT_RANGE_*) (NLA_U32) +*/ +enum nft_masq_attributes { +NFTA_MASQ_FLAGS , + __NFTA_MASQ_MAX +}; +#define NFTA_MASQ_MAX (__NFTA_MASQ_MAX - 1) + +#endif /* _LINUX_NF_TABLES_H */
net/ipv4/netfilter/Kconfig +6 -0
@@ -190,6 +190,12 @@ config NF_NAT_MASQUERADE_IPV4 This is the kernel functionality to provide NAT in the masquerade flavour (automatic source address selection). +config NFT_MASQ_IPV4 + tristate "nft_masq IPv4 support" + depends on NF_TABLES_IPV4 + depends on NFT_MASQ + select NF_NAT_MASQUERADE_IPV4 + config IP_NF_TARGET_MASQUERADE tristate "MASQUERADE target support" select NF_NAT_MASQUERADE_IPV4
net/ipv4/netfilter/Makefile +1 -0
@@ -36,6 +36,7 @@ obj-$(CONFIG_NF_TABLES_IPV4) += nf_tables_ipv4.o obj-$(CONFIG_NFT_CHAIN_ROUTE_IPV4) += nft_chain_route_ipv4.o obj-$(CONFIG_NFT_CHAIN_NAT_IPV4) += nft_chain_nat_ipv4.o obj-$(CONFIG_NFT_REJECT_IPV4) += nft_reject_ipv4.o +obj-$(CONFIG_NFT_MASQ_IPV4) += nft_masq_ipv4.o obj-$(CONFIG_NF_TABLES_ARP) += nf_tables_arp.o # generic IP tables
net/ipv4/netfilter/nft_masq_ipv4.c new file +92 -0
92 lines not on this page · raw message
net/ipv6/netfilter/Kconfig +6 -0
@@ -252,6 +252,12 @@ config NF_NAT_MASQUERADE_IPV6 This is the kernel functionality to provide NAT in the masquerade flavour (automatic source address selection) for IPv6. +config NFT_MASQ_IPV6 + tristate "nft_masq IPv6 support" + depends on NF_TABLES_IPV6 + depends on NFT_MASQ + select NF_NAT_MASQUERADE_IPV6 + config IP6_NF_TARGET_MASQUERADE tristate "MASQUERADE target support" select NF_NAT_MASQUERADE_IPV6
net/ipv6/netfilter/Makefile +1 -0
@@ -32,6 +32,7 @@ obj-$(CONFIG_NF_TABLES_IPV6) += nf_tables_ipv6.o obj-$(CONFIG_NFT_CHAIN_ROUTE_IPV6) += nft_chain_route_ipv6.o obj-$(CONFIG_NFT_CHAIN_NAT_IPV6) += nft_chain_nat_ipv6.o obj-$(CONFIG_NFT_REJECT_IPV6) += nft_reject_ipv6.o +obj-$(CONFIG_NFT_MASQ_IPV6) += nft_masq_ipv6.o # matches obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o
net/ipv6/netfilter/nft_masq_ipv6.c new file +92 -0
92 lines not on this page · raw message
net/netfilter/Kconfig +9 -0
@@ -528,6 +528,15 @@ config NFT_REJECT_INET default NFT_REJECT tristate +config NFT_MASQ + depends on NF_TABLES + depends on NF_CONNTRACK + depends on NF_NAT + tristate "Netfilter nf_tables masquerade support" + help + This options adds the "masquerade" expression that you can use + to perform NAT in the masquerade flavour. + config NFT_COMPAT depends on NF_TABLES depends on NETFILTER_XTABLES
net/netfilter/Makefile +1 -0
@@ -87,6 +87,7 @@ obj-$(CONFIG_NFT_RBTREE) += nft_rbtree.o obj-$(CONFIG_NFT_HASH) += nft_hash.o obj-$(CONFIG_NFT_COUNTER) += nft_counter.o obj-$(CONFIG_NFT_LOG) += nft_log.o +obj-$(CONFIG_NFT_MASQ) += nft_masq.o # generic X tables obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
net/netfilter/nft_masq.c new file +60 -0
60 lines not on this page · raw message