netfilter: nft_nat: include a flag attribute
Subsystems (2)
PATCH v4 1/5 netfilter: nft_nat: include a flag attribute
Both SNAT and DNAT (and the upcoming masquerade) can have additional configuration parameters, such as port randomization or NAT addressing persistence.
We can cover these scenarios by simply adding a flag attribute for userspace to fill when needed.
The flags to use are defined in include/uapi/linux/netfilter/nf_nat.h,
NF_NAT_RANGE_MAP_IPS
NF_NAT_RANGE_PROTO_SPECIFIED
NF_NAT_RANGE_PROTO_RANDOM
NF_NAT_RANGE_PERSISTENT
NF_NAT_RANGE_PROTO_RANDOM_FULLY NF_NAT_RANGE_PROTO_RANDOM_ALL
The caller must take care of not messing up with the flags, as they are added unconditionally to the final resulting nf_nat_range.
---
v2: address Florian Westphal's comments: check all flag bits to be known.
v3: style cleanup requested by Pablo Neira. Mask name shortened.
v4: nf-next rebase.
include/uapi/linux/netfilter/nf_nat.h | 5 +++++ include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/netfilter/nft_nat.c | 16 ++++++++++++++++ 3 files changed, 23 insertions(+)
include/uapi/linux/netfilter/nf_nat.h +5 -0
@@ -13,6 +13,11 @@#define NF_NAT_RANGE_PROTO_RANDOM_ALL \ (NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PROTO_RANDOM_FULLY) +#define NF_NAT_RANGE_MASK \ + (NF_NAT_RANGE_MAP_IPS|NF_NAT_RANGE_PROTO_SPECIFIED \ + |NF_NAT_RANGE_PROTO_RANDOM|NF_NAT_RANGE_PERSISTENT \ + |NF_NAT_RANGE_PROTO_RANDOM_FULLY) +struct nf_nat_ipv4_range {unsigned int flags;__be32 min_ip;
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -785,6 +785,7 @@ enum nft_nat_types {* @NFTA_NAT_REG_ADDR_MAX: source register of address range end (NLA_U32: nft_registers) * @NFTA_NAT_REG_PROTO_MIN: source register of proto range start (NLA_U32: nft_registers) * @NFTA_NAT_REG_PROTO_MAX: source register of proto range end (NLA_U32: nft_registers) +* @NFTA_NAT_FLAGS: additional NAT configuration (NF_NAT_RANGE_*) (NLA_U32) */ enum nft_nat_attributes {NFTA_NAT_UNSPEC ,
@@ -794,6 +795,7 @@ enum nft_nat_attributes {NFTA_NAT_REG_ADDR_MAX ,NFTA_NAT_REG_PROTO_MIN ,NFTA_NAT_REG_PROTO_MAX , +NFTA_NAT_FLAGS , __NFTA_NAT_MAX };#define NFTA_NAT_MAX (__NFTA_NAT_MAX - 1)
net/netfilter/nft_nat.c +16 -0
@@ -33,6 +33,7 @@ struct nft_nat { enum nft_registers sreg_proto_max:8; enum nf_nat_manip_type type:8;u8 family; +u16 flags; }; static void nft_nat_eval(const struct nft_expr *expr,
@@ -71,6 +72,8 @@ static void nft_nat_eval(const struct nft_expr *expr, range.flags |=NF_NAT_RANGE_PROTO_SPECIFIED ; } + range.flags |= priv->flags; + data[NFT_REG_VERDICT ].verdict =nf_nat_setup_info (ct, &range, priv->type); }
@@ -82,6 +85,7 @@ static const struct nla_policy nft_nat_policy[NFTA_NAT_MAX + 1] = { [NFTA_NAT_REG_ADDR_MAX] = { .type = NLA_U32 }, [NFTA_NAT_REG_PROTO_MIN] = { .type = NLA_U32 }, [NFTA_NAT_REG_PROTO_MAX] = { .type = NLA_U32 }, + [NFTA_NAT_FLAGS] = { .type = NLA_U32 }, }; static int nft_nat_init(const struct nft_ctx *ctx, const struct nft_expr *expr,
@@ -149,6 +153,12 @@ static int nft_nat_init(const struct nft_ctx *ctx, const struct nft_expr *expr, }else priv->sreg_proto_max = priv->sreg_proto_min; +if (tb[NFTA_NAT_FLAGS ]) { + priv->flags =ntohl (nla_get_be32 (tb[NFTA_NAT_FLAGS ])); +if (priv->flags & ~NF_NAT_RANGE_MASK ) +return -EINVAL ; + } +return 0 ; }
@@ -183,6 +193,12 @@ static int nft_nat_dump(struct sk_buff *skb, const struct nft_expr *expr) htonl(priv->sreg_proto_max))) goto nla_put_failure; } + +if (priv->flags !=0 ) { +if (nla_put_be32 (skb,NFTA_NAT_FLAGS ,htonl (priv->flags))) + goto nla_put_failure; + } +return 0 ; nla_put_failure:
PATCH v4 2/5 netfilter: nf_nat_masquerade_ipv4: code factorization
Let's refactor the code so we can reach the masquerade functionality from outside the xt context (ie, nftables).
The patch includes adding an atomic counter to the masquerade notifier: the stuff to be done by the notifier is the same in any case, and agnostic about who called it. Only one notification handler is needed.
This factorization only involves IPv4; a similar patch will follow to handle IPv6.
---
v2: no changes.
v3: no changes.
v4: nf-next rebased.
.../net/netfilter/ipv4/nf_nat_masquerade_ipv4.h | 14 ++ net/ipv4/netfilter/Kconfig | 7 + net/ipv4/netfilter/Makefile | 1 net/ipv4/netfilter/ipt_MASQUERADE.c | 108 +------------- net/ipv4/netfilter/nf_nat_masquerade_ipv4.c | 154 ++++++++++++++++++++ 5 files changed, 185 insertions(+), 99 deletions(-) create mode 100644 include/net/netfilter/ipv4/nf_nat_masquerade_ipv4.h create mode 100644 net/ipv4/netfilter/nf_nat_masquerade_ipv4.c
include/net/netfilter/ipv4/nf_nat_masquerade_ipv4.h new file +14 -0
@@ -0,0 +1,14 @@ +#ifndef _NF_NAT_MASQUERADE_IPV4_H_ +#define _NF_NAT_MASQUERADE_IPV4_H_ + +#include <net/netfilter/nf_nat.h> + +unsigned int +nf_nat_masquerade_ipv4 (struct sk_buff *skb,unsigned int hooknum, +const struct nf_nat_range *range, +const struct net_device *out); + +void nf_nat_masquerade_ipv4_register_notifier (void ); +void nf_nat_masquerade_ipv4_unregister_notifier (void ); + +#endif /*_NF_NAT_MASQUERADE_IPV4_H_ */
net/ipv4/netfilter/Kconfig +7 -0
@@ -184,8 +184,15 @@ config NF_NAT_IPV4 if NF_NAT_IPV4 +config NF_NAT_MASQUERADE_IPV4 + tristate "IPv4 masquerade support" + help + This is the kernel functionality to provide NAT in the masquerade + flavour (automatic source address selection). + config IP_NF_TARGET_MASQUERADE tristate "MASQUERADE target support" + select NF_NAT_MASQUERADE_IPV4 default m if NETFILTER_ADVANCED=n help Masquerading is a special case of NAT: all outgoing connections are
net/ipv4/netfilter/Makefile +1 -0
@@ -27,6 +27,7 @@ obj-$(CONFIG_NF_LOG_IPV4) += nf_log_ipv4.o obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o +obj-$(CONFIG_NF_NAT_MASQUERADE_IPV4) += nf_nat_masquerade_ipv4.o # NAT protocols (nf_nat) obj-$(CONFIG_NF_NAT_PROTO_GRE) += nf_nat_proto_gre.o
net/ipv4/netfilter/ipt_MASQUERADE.c +9 -99
138 lines not on this page · raw message
net/ipv4/netfilter/nf_nat_masquerade_ipv4.c new file +154 -0
154 lines not on this page · raw message
Re: [nf_tables PATCH v4 2/5] netfilter: nf_nat_masquerade_ipv4: code factorization
Quoted 9 lines · Arturo Borrero Gonzalez
Let's refactor the code so we can reach the masquerade functionality from outside the xt context (ie, nftables).
The patch includes adding an atomic counter to the masquerade notifier: the stuff to be done by the notifier is the same in any case, and agnostic about who called it. Only one notification handler is needed.
This factorization only involves IPv4; a similar patch will follow to handle IPv6.
Applied, thanks.
PATCH v4 3/5 netfilter: nf_nat_masquerade_ipv6: code factorization
In reply to Arturo Borrero GonzalezLet's refactor the code so we can reach the masquerade functionality from outside the xt context (ie, nftables).
The patch includes adding an atomic counter to the masquerade notifier: the stuff to be done by the notifier is the same in any case, and agnostic about who called it. Only one notification handler is needed.
This factorization only involves IPv6; a similar patch exists to handle IPv4.
---
v2: no changes.
v3: no changes.
v4: nf-next rebased.
.../net/netfilter/ipv6/nf_nat_masquerade_ipv6.h | 10 ++ net/ipv6/netfilter/Kconfig | 7 + net/ipv6/netfilter/Makefile | 1 net/ipv6/netfilter/ip6t_MASQUERADE.c | 76 +------------ net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 120 ++++++++++++++++++++ 5 files changed, 143 insertions(+), 71 deletions(-) create mode 100644 include/net/netfilter/ipv6/nf_nat_masquerade_ipv6.h create mode 100644 net/ipv6/netfilter/nf_nat_masquerade_ipv6.c
include/net/netfilter/ipv6/nf_nat_masquerade_ipv6.h new file +10 -0
@@ -0,0 +1,10 @@ +#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_range *range, +const struct net_device *out); +void nf_nat_masquerade_ipv6_register_notifier (void ); +void nf_nat_masquerade_ipv6_unregister_notifier (void ); + +#endif /* _NF_NAT_MASQUERADE_IPV6_H_ */
net/ipv6/netfilter/Kconfig +7 -0
@@ -246,8 +246,15 @@ config NF_NAT_IPV6 if NF_NAT_IPV6 +config NF_NAT_MASQUERADE_IPV6 + tristate "IPv6 masquerade support" + help + This is the kernel functionality to provide NAT in the masquerade + flavour (automatic source address selection) for IPv6. + config IP6_NF_TARGET_MASQUERADE tristate "MASQUERADE target support" + select NF_NAT_MASQUERADE_IPV6 help Masquerading is a special case of NAT: all outgoing connections are changed to seem to come from a particular interface's address, and
net/ipv6/netfilter/Makefile +1 -0
@@ -18,6 +18,7 @@ obj-$(CONFIG_NF_CONNTRACK_IPV6) += nf_conntrack_ipv6.o nf_nat_ipv6-y := nf_nat_l3proto_ipv6.o nf_nat_proto_icmpv6.o obj-$(CONFIG_NF_NAT_IPV6) += nf_nat_ipv6.o +obj-$(CONFIG_NF_NAT_MASQUERADE_IPV6) += nf_nat_masquerade_ipv6.o # defrag nf_defrag_ipv6-y := nf_defrag_ipv6_hooks.o nf_conntrack_reasm.o
net/ipv6/netfilter/ip6t_MASQUERADE.c +5 -71
103 lines not on this page · raw message
net/ipv6/netfilter/nf_nat_masquerade_ipv6.c new file +120 -0
120 lines not on this page · raw message
Pablo Neira Ayuso
maintainerRe: [nf_tables PATCH v4 3/5] netfilter: nf_nat_masquerade_ipv6: code factorization
Quoted 9 lines · Arturo Borrero Gonzalez
Let's refactor the code so we can reach the masquerade functionality from outside the xt context (ie, nftables).
The patch includes adding an atomic counter to the masquerade notifier: the stuff to be done by the notifier is the same in any case, and agnostic about who called it. Only one notification handler is needed.
This factorization only involves IPv6; a similar patch exists to handle IPv4.
Also applied, thanks.
PATCH v4 4/5 netfilter: nft_nat: split code in AF parts
In reply to Arturo Borrero GonzalezThis patch refactorices the nft_nat code into AF specific parts, allowing further work in the AF specific zones, like adding masquerade support.
While at it, fix coding style in several places.
---
v2: no changes.
v3: flags is u16. This also applies to the patch 1/5. Common _dump() function.
v4: nf-next rebased.
include/net/netfilter/nft_nat.h | 22 ++++++ net/ipv4/netfilter/Kconfig | 7 ++ net/ipv4/netfilter/Makefile | 1 net/ipv4/netfilter/nft_nat_ipv4.c | 98 ++++++++++++++++++++++++++++ net/ipv6/netfilter/Kconfig | 7 ++ net/ipv6/netfilter/Makefile | 1 net/ipv6/netfilter/nft_nat_ipv6.c | 98 ++++++++++++++++++++++++++++ net/netfilter/nft_nat.c | 129 +++++++------------------------------ 8 files changed, 260 insertions(+), 103 deletions(-) create mode 100644 include/net/netfilter/nft_nat.h create mode 100644 net/ipv4/netfilter/nft_nat_ipv4.c create mode 100644 net/ipv6/netfilter/nft_nat_ipv6.c
include/net/netfilter/nft_nat.h new file +22 -0
@@ -0,0 +1,22 @@ +#ifndef _NFT_NAT_H_ +#define _NFT_NAT_H_ + +struct nft_nat { +enum nft_registers sreg_addr_min:8 ; +enum nft_registers sreg_addr_max:8 ; +enum nft_registers sreg_proto_min:8 ; +enum nft_registers sreg_proto_max:8 ; +enum nf_nat_manip_type type:8 ; +u8 family; +u16 flags; +}; + +extern const struct nla_policy nft_nat_policy[]; + +int nft_nat_init (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nlattr *const tb[]); + +int nft_nat_dump (struct sk_buff *skb,const struct nft_expr *expr); + +#endif /* _NFT_NAT_H_ */
net/ipv4/netfilter/Kconfig +7 -0
@@ -190,6 +190,13 @@ config NF_NAT_MASQUERADE_IPV4 This is the kernel functionality to provide NAT in the masquerade flavour (automatic source address selection). +config NFT_NAT_IPV4 + tristate "nft_nat IPv4 support" + depends on NFT_NAT + select NF_NAT_MASQUERADE_IPV4 + help + This is the nftables expression that handles NAT in 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_NAT_IPV4) += nft_nat_ipv4.o obj-$(CONFIG_NF_TABLES_ARP) += nf_tables_arp.o # generic IP tables
net/ipv4/netfilter/nft_nat_ipv4.c new file +98 -0
98 lines not on this page · raw message
net/ipv6/netfilter/Kconfig +7 -0
@@ -252,6 +252,13 @@ 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_NAT_IPV6 + tristate "nft_nat IPv6 support" + depends on NFT_NAT + select NF_NAT_MASQUERADE_IPV6 + help + This is the nftables expression that handles NAT in 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_NAT_IPV6) += nft_nat_ipv6.o # matches obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o
net/ipv6/netfilter/nft_nat_ipv6.c new file +98 -0
98 lines not on this page · raw message
net/netfilter/nft_nat.c +26 -103
186 lines not on this page · raw message
PATCH v4 5/5 netfilter: nft_nat: add masquerade support
In reply to Arturo Borrero GonzalezThis patch adds masquerade support to nft_nat.
Note that enum nf_nat_manip_type is replaced by enum nft_nat_types in order to support masquerade.
---
v2: fix missing htonl() conversion for NFTA_NAT_TYPE in _ipv6_dump().
v3: no changes.
v4: nf-next rebased.
include/net/netfilter/nft_nat.h | 2 +- include/uapi/linux/netfilter/nf_tables.h | 8 ++++-- net/ipv4/netfilter/nft_nat_ipv4.c | 40 ++++++++++++++++++++++++++++-- net/ipv6/netfilter/nft_nat_ipv6.c | 39 +++++++++++++++++++++++++++-- net/netfilter/nft_nat.c | 20 ++++----------- 5 files changed, 84 insertions(+), 25 deletions(-)
include/net/netfilter/nft_nat.h +1 -1
@@ -6,7 +6,7 @@ struct nft_nat { enum nft_registers sreg_addr_max:8; enum nft_registers sreg_proto_min:8; enum nft_registers sreg_proto_max:8; - enum nf_nat_manip_type type:8; + enum nft_nat_types type:8;u8 family;u16 flags; };
include/uapi/linux/netfilter/nf_tables.h +5 -3
@@ -766,14 +766,16 @@ enum nft_reject_attributes {#define NFTA_REJECT_MAX (__NFTA_REJECT_MAX - 1)/** -* enum nft_nat_types - nf_tables nat expression NAT types +* enum nft_nat_types - nf_tables nat expression NAT types. * * @NFT_NAT_SNAT: source NAT * @NFT_NAT_DNAT: destination NAT +* @NFT_NAT_MASQUERADE: masquerade NAT */ enum nft_nat_types { -NFT_NAT_SNAT , -NFT_NAT_DNAT , +NFT_NAT_SNAT ,/* NF_NAT_MANIP_SRC */ +NFT_NAT_DNAT ,/* NF_NAT_MANIP_DST */ +NFT_NAT_MASQUERADE , };/**
net/ipv4/netfilter/nft_nat_ipv4.c +37 -3
@@ -36,6 +36,7 @@ static void nft_nat_ipv4_eval(const struct nft_expr *expr,enum ip_conntrack_info ctinfo;struct nf_conn *ct =nf_ct_get (pkt->skb, &ctinfo);struct nf_nat_range range; +unsigned int verdict;memset (&range,0 ,sizeof (range));if (priv->sreg_addr_min) {
@@ -58,8 +59,40 @@ static void nft_nat_ipv4_eval(const struct nft_expr *expr, range.flags |= priv->flags; - data[NFT_REG_VERDICT ].verdict = -nf_nat_setup_info (ct, &range, priv->type); +if (priv->type ==NFT_NAT_MASQUERADE ) { + verdict =nf_nat_masquerade_ipv4 (pkt->skb, pkt->ops->hooknum, + &range, pkt->out); + }else { + verdict =nf_nat_setup_info (ct, &range, priv->type); + } + + data[NFT_REG_VERDICT ].verdict = verdict; +} + +static int nft_nat_ipv4_init (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nlattr *const tb[]) +{ +int ret; +struct nft_nat *priv =nft_expr_priv (expr); + + ret =nft_nat_init (ctx, expr, tb); +if (ret <0 ) + goto out; + +if (priv->type ==NFT_NAT_MASQUERADE ) +nf_nat_masquerade_ipv4_register_notifier (); +out: +return ret; +} + +static void nft_nat_ipv4_destroy (const struct nft_ctx *ctx, +const struct nft_expr *expr) +{ +struct nft_nat *priv =nft_expr_priv (expr); + +if (priv->type ==NFT_NAT_MASQUERADE ) +nf_nat_masquerade_ipv4_unregister_notifier (); }static struct nft_expr_type nft_nat_ipv4_type;
@@ -67,7 +100,8 @@ static const struct nft_expr_ops nft_nat_ipv4_ops = { .type = &nft_nat_ipv4_type, .size = NFT_EXPR_SIZE(sizeof(struct nft_nat)), .eval = nft_nat_ipv4_eval, - .init = nft_nat_init, + .init = nft_nat_ipv4_init, + .destroy = nft_nat_ipv4_destroy, .dump = nft_nat_dump, };
net/ipv6/netfilter/nft_nat_ipv6.c +36 -3
@@ -26,6 +26,7 @@#include <net/netfilter/nf_nat_l3proto.h> #include <net/ip.h> #include <net/netfilter/nft_nat.h> +#include <net/netfilter/ipv6/nf_nat_masquerade_ipv6.h> static void nft_nat_ipv6_eval(const struct nft_expr *expr, struct nft_data data[NFT_REG_MAX + 1],
@@ -35,6 +36,7 @@ static void nft_nat_ipv6_eval(const struct nft_expr *expr,enum ip_conntrack_info ctinfo;struct nf_conn *ct =nf_ct_get (pkt->skb, &ctinfo);struct nf_nat_range range; +unsigned int verdict;memset (&range,0 ,sizeof (range));if (priv->sreg_addr_min) {
@@ -58,8 +60,38 @@ static void nft_nat_ipv6_eval(const struct nft_expr *expr, range.flags |= priv->flags; - data[NFT_REG_VERDICT ].verdict = -nf_nat_setup_info (ct, &range, priv->type); +if (priv->type ==NFT_NAT_MASQUERADE ) + verdict =nf_nat_masquerade_ipv6 (pkt->skb, &range, pkt->out); +else + verdict =nf_nat_setup_info (ct, &range, priv->type); + + data[NFT_REG_VERDICT ].verdict = verdict; +} + +static int nft_nat_ipv6_init (const struct nft_ctx *ctx, +const struct nft_expr *expr, +const struct nlattr *const tb[]) +{ +int ret; +struct nft_nat *priv =nft_expr_priv (expr); + + ret =nft_nat_init (ctx, expr, tb); +if (ret <0 ) + goto out; + +if (priv->type ==NFT_NAT_MASQUERADE ) +nf_nat_masquerade_ipv6_register_notifier (); +out: +return ret; +} + +static void nft_nat_ipv6_destroy (const struct nft_ctx *ctx, +const struct nft_expr *expr) +{ +struct nft_nat *priv =nft_expr_priv (expr); + +if (priv->type ==NFT_NAT_MASQUERADE ) +nf_nat_masquerade_ipv6_unregister_notifier (); }static struct nft_expr_type nft_nat_ipv6_type;
@@ -67,7 +99,8 @@ static const struct nft_expr_ops nft_nat_ipv6_ops = { .type = &nft_nat_ipv6_type, .size = NFT_EXPR_SIZE(sizeof(struct nft_nat)), .eval = nft_nat_ipv6_eval, - .init = nft_nat_init, + .init = nft_nat_ipv6_init, + .destroy = nft_nat_ipv6_destroy, .dump = nft_nat_dump, };
net/netfilter/nft_nat.c +5 -15
@@ -48,12 +48,11 @@ int nft_nat_init(const struct nft_ctx *ctx, const struct nft_expr *expr,if (tb[NFTA_NAT_TYPE ] ==NULL )return -EINVAL ; -switch (ntohl (nla_get_be32 (tb[NFTA_NAT_TYPE ]))) { + priv->type =ntohl (nla_get_be32 (tb[NFTA_NAT_TYPE ])); +switch (priv->type) {case NFT_NAT_SNAT : - priv->type =NF_NAT_MANIP_SRC ; -break ;case NFT_NAT_DNAT : - priv->type =NF_NAT_MANIP_DST ; +case NFT_NAT_MASQUERADE :break ;default :return -EINVAL ;
@@ -121,17 +120,8 @@ int nft_nat_dump(struct sk_buff *skb, const struct nft_expr *expr) {const struct nft_nat *priv =nft_expr_priv (expr); -switch (priv->type) { -case NF_NAT_MANIP_SRC : -if (nla_put_be32 (skb,NFTA_NAT_TYPE ,htonl (NFT_NAT_SNAT ))) - goto nla_put_failure; -break ; -case NF_NAT_MANIP_DST : -if (nla_put_be32 (skb,NFTA_NAT_TYPE ,htonl (NFT_NAT_DNAT ))) - goto nla_put_failure; -break ; - } - +if (nla_put_be32 (skb,NFTA_NAT_TYPE ,htonl (priv->type))) + goto nla_put_failure;if (nla_put_be32 (skb,NFTA_NAT_FAMILY ,htonl (priv->family))) goto nla_put_failure; if (nla_put_be32(skb,
Re: [nf_tables PATCH v4 5/5] netfilter: nft_nat: add masquerade support
Quoted 4 lines · Arturo Borrero Gonzalez
This patch adds masquerade support to
nft_nat.Note that enum
nf_nat_manip_typeis replaced by enumnft_nat_typesin order to support masquerade.
Is it really worth combining them? We have lots of code churn to move them into a single module, and static NAT and masquerading have some fundamental differences in the data they need, so now we're adding new code to validate all of this, we're adding a new NAT type which is actually not a new NAT type but simply a special case of SNAT etc.
Why not simply create a new masquerade expression?
Pablo Neira Ayuso
maintainerRe: [nf_tables PATCH v4 5/5] netfilter: nft_nat: add masquerade support
Quoted 6 lines · Patrick McHardy
Quoted 4 lines · Arturo Borrero Gonzalez
This patch adds masquerade support to
nft_nat.Note that enum
nf_nat_manip_typeis replaced by enumnft_nat_typesin order to support masquerade.
Quoted 7 lines
Is it really worth combining them? We have lots of code churn to move them into a single module, and static NAT and masquerading have some fundamental differences in the data they need, so now we're adding new code to validate all of this, we're adding a new NAT type which is actually not a new NAT type but simply a special case of SNAT etc.
Why not simply create a new masquerade expression?
Indeed. We're going to have four unused fields in the nft_nat expression:
+ enum nft_registers sreg_addr_min:8; + enum nft_registers sreg_addr_max:8; + enum nft_registers sreg_proto_min:8; + enum nft_registers sreg_proto_max:8;
And we can skip the nft_nat per family split that happens in patch 4/5.
I like the idea of the masquerade expression.
Re: [nf_tables PATCH v4 5/5] netfilter: nft_nat: add masquerade support
Quoted 2 lines · Pablo Neira Ayuso
I like the idea of the masquerade expression.
Ok, I also like the idea.
Suggestions for the name of the new expression?
I would bet for nft_masq.
Signature · 5 lines
Arturo Borrero González -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [nf_tables PATCH v4 5/5] netfilter: nft_nat: add masquerade support
Quoted 9 lines · Arturo Borrero Gonzalez
Quoted 2 lines · Pablo Neira Ayuso
I like the idea of the masquerade expression.
Ok, I also like the idea.
Suggestions for the name of the new expression?
I would bet for
nft_masq.
Sounds good.
Pablo Neira Ayuso
maintainerQuoted 14 lines · Arturo Borrero Gonzalez
Both SNAT and DNAT (and the upcoming masquerade) can have additional configuration parameters, such as port randomization or NAT addressing persistence.
We can cover these scenarios by simply adding a flag attribute for userspace to fill when needed.The flags to use are defined in
include/uapi/linux/netfilter/nf_nat.h,
NF_NAT_RANGE_MAP_IPS
NF_NAT_RANGE_PROTO_SPECIFIED
NF_NAT_RANGE_PROTO_RANDOM
NF_NAT_RANGE_PERSISTENT
NF_NAT_RANGE_PROTO_RANDOM_FULLYNF_NAT_RANGE_PROTO_RANDOM_ALL
Quoted 2 lines
The caller must take care of not messing up with the flags, as they are added unconditionally to the final resulting
nf_nat_range.
Not sure this comment is relevant. Of course, userspace should select the flags accordingly :-). Let me know if the intention was other than insisting on the fact that the flags alter the way the NAT is done.
Quoted 16 lines
Signed-off-by Arturo Borrero Gonzalez <[email protected]>---
v2: address Florian Westphal's comments: check all flag bits to be known.
v3: style cleanup requested by Pablo Neira. Mask name shortened.
v4: nf-next rebase.include/uapi/linux/netfilter/nf_nat.h | 5 +++++ include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/netfilter/nft_nat.c | 16 ++++++++++++++++ 3 files changed, 23 insertions(+)include/uapi/linux/netfilter/nf_nat.h +0
-0
include/uapi/linux/netfilter/nf_nat.h line 19
Quoted 7 lines
include/uapi/linux/netfilter/nf_nat.h +4
-0@@ -13,6 +13,11 @@#define NF_NAT_RANGE_PROTO_RANDOM_ALL \ (NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PROTO_RANDOM_FULLY) +#define NF_NAT_RANGE_MASK \ + (NF_NAT_RANGE_MAP_IPS|NF_NAT_RANGE_PROTO_SPECIFIED \ + |NF_NAT_RANGE_PROTO_RANDOM|NF_NAT_RANGE_PERSISTENT \ + |NF_NAT_RANGE_PROTO_RANDOM_FULLY)
I'm going to make the following comestic change:
#define NF_NAT_RANGE_MASK \
(NF_NAT_RANGE_MAP_IPS | NF_NAT_RANGE_PROTO_SPECIFIED | \
NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PERSISTENT | \ NF_NAT_RANGE_PROTO_RANDOM_FULLY)
Next time, place the '|' '&' and so on after at the end of the line.
If no more comments, I'll push this to nf-next. Thanks.
Quoted 15 lines · Pablo Neira Ayuso
Quoted 14 lines · Arturo Borrero Gonzalez
Both SNAT and DNAT (and the upcoming masquerade) can have additional configuration parameters, such as port randomization or NAT addressing persistence.
We can cover these scenarios by simply adding a flag attribute for userspace to fill when needed.The flags to use are defined in
include/uapi/linux/netfilter/nf_nat.h,
NF_NAT_RANGE_MAP_IPS
NF_NAT_RANGE_PROTO_SPECIFIED
NF_NAT_RANGE_PROTO_RANDOM
NF_NAT_RANGE_PERSISTENT
NF_NAT_RANGE_PROTO_RANDOM_FULLYNF_NAT_RANGE_PROTO_RANDOM_ALL
Quoted 7 lines
Quoted 2 lines
The caller must take care of not messing up with the flags, as they are added unconditionally to the final resulting
nf_nat_range.Not sure this comment is relevant. Of course, userspace should select the flags accordingly :-). Let me know if the intention was other than insisting on the fact that the flags alter the way the NAT is done.
Yes, I meant that no additional check is done to know if the flags combination makes sense.
Quoted 10 lines
I'm going to make the following comestic change:
#define NF_NAT_RANGE_MASK \ (NF_NAT_RANGE_MAP_IPS | NF_NAT_RANGE_PROTO_SPECIFIED | \ NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PERSISTENT | \
NF_NAT_RANGE_PROTO_RANDOM_FULLY)Next time, place the '|' '&' and so on after at the end of the line.
Ok, thanks.
Signature · 5 lines
Arturo Borrero González -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Pablo Neira Ayuso
maintainerQuoted 19 lines · Arturo Borrero Gonzalez
Quoted 18 lines · Pablo Neira Ayuso
Quoted 16 lines · Arturo Borrero Gonzalez
Both SNAT and DNAT (and the upcoming masquerade) can have additional configuration parameters, such as port randomization or NAT addressing persistence.
We can cover these scenarios by simply adding a flag attribute for userspace to fill when needed.The flags to use are defined in
include/uapi/linux/netfilter/nf_nat.h,
NF_NAT_RANGE_MAP_IPS
NF_NAT_RANGE_PROTO_SPECIFIED
NF_NAT_RANGE_PROTO_RANDOM
NF_NAT_RANGE_PERSISTENT
NF_NAT_RANGE_PROTO_RANDOM_FULLYNF_NAT_RANGE_PROTO_RANDOM_ALLThe caller must take care of not messing up with the flags, as they are added unconditionally to the final resulting
nf_nat_range.
Quoted 7 lines
Quoted 4 lines
Not sure this comment is relevant. Of course, userspace should select the flags accordingly :-). Let me know if the intention was other than insisting on the fact that the flags alter the way the NAT is done.
Yes, I meant that no additional check is done to know if the flags combination makes sense.
I see. iptables does exactly the same thing at this moment. At quick glance I think random flag combinations should not puzzle nf_nat_setup_info(), but it would be good to give it a closer look.