src: NAT support for intervals in maps
Pablo Neira Ayuso
maintainerPATCH 1/3 src: NAT support for intervals in maps
This patch allows you to specify an interval of IP address in maps.
table ip x {
chain y {
type nat hook postrouting priority srcnat; policy accept;
snat ip interval to ip saddr map { 10.141.11.4 : 192.168.2.2-192.168.2.4 }
}}
The example above performs SNAT to packets that comes from 10.141.11.4 to an interval of IP addresses from 192.168.2.2 to 192.168.2.4 (both included).
You can also combine this with dynamic maps:
table ip x {
map y {
type ipv4_addr : interval ipv4_addr
flags interval
elements = { 10.141.10.0/24 : 192.168.2.2-192.168.2.4 }
}
chain y {
type nat hook postrouting priority srcnat; policy accept;
snat ip interval to ip saddr map @y
}}
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/expression.h | 2 ++ include/statement.h | 5 +++ src/evaluate.c | 44 +++++++++++++++++++++++-- src/mnl.c | 5 ++- src/netlink.c | 67 +++++++++++++++++++++++++++++++++++++-- src/netlink_delinearize.c | 39 +++++++++++++++++++++++ src/netlink_linearize.c | 8 +++++ src/parser_bison.y | 34 ++++++++++++++++++++ src/rule.c | 3 ++ src/statement.c | 2 ++ 10 files changed, 204 insertions(+), 5 deletions(-)
include/expression.h +2 -0
@@ -184,6 +184,7 @@ const struct expr_ops *expr_ops_by_type(enum expr_types etype);* @EXPR_F_PROTOCOL: expressions describes upper layer protocol * @EXPR_F_INTERVAL_END: set member ends an open interval * @EXPR_F_BOOLEAN: expression is boolean (set by relational expr on LHS) +* @EXPR_F_INTERVAL: expression describes a interval */ enum expr_flags {EXPR_F_CONSTANT =0x1 ,
@@ -191,6 +192,7 @@ enum expr_flags {EXPR_F_PROTOCOL =0x4 ,EXPR_F_INTERVAL_END =0x8 ,EXPR_F_BOOLEAN =0x10 , + EXPR_F_INTERVAL = 0x20, };#include <payload.h>
include/statement.h +5 -0
@@ -119,6 +119,10 @@ enum nft_nat_etypes {extern const char *nat_etype2str (enum nft_nat_etypes type); +enum { +STMT_NAT_F_INTERVAL = (1 <<0 ), +}; +struct nat_stmt {enum nft_nat_etypes type;struct expr *addr;
@@ -126,6 +130,7 @@ struct nat_stmt {uint32_t flags;uint8_t family;bool ipportmap; +uint32_t internal_flags; }; extern struct stmt *nat_stmt_alloc(const struct location *loc,
src/evaluate.c +42 -2
80 lines not on this page · raw message
src/mnl.c +4 -1
@@ -1012,8 +1012,11 @@ int mnl_nft_set_add(struct netlink_ctx *ctx, struct cmd *cmd,memory_allocation_error ();set_key_expression (ctx, set->key, set->flags, udbuf,NFTNL_UDATA_SET_KEY_TYPEOF ); -if (set->data) +if (set->data) {set_key_expression (ctx, set->data, set->flags, udbuf,NFTNL_UDATA_SET_DATA_TYPEOF ); +nftnl_udata_put_u32 (udbuf,NFTNL_UDATA_SET_DATA_INTERVAL , + !!(set->data->flags &EXPR_F_INTERVAL )); + }if (set->desc.field_len[0 ]) { nftnl_set_set_data(nls, NFTNL_SET_DESC_CONCAT,
src/netlink.c +65 -2
123 lines not on this page · raw message
src/netlink_delinearize.c +39 -0
@@ -979,6 +979,38 @@ static void netlink_parse_reject(struct netlink_parse_ctx *ctx, ctx->stmt = stmt; } +static bool is_nat_addr_map (const struct expr *addr,uint8_t family) +{ +const struct expr *mappings, *data; +const struct set *set; + +if (!addr || +expr_ops (addr)->type !=EXPR_MAP ) +return false; + + mappings = addr->right; +if (expr_ops (mappings)->type !=EXPR_SET_REF ) +return false; + + set = mappings->set; + data = set->data; + +if (!(data->flags &EXPR_F_INTERVAL )) +return false; + +/* if we're dealing with an address:address map, +* the length will be bit_sizeof(addr) + 32 (one register). +*/ +switch (family) { +case NFPROTO_IPV4 : +return data->len ==32 +32 ; +case NFPROTO_IPV6 : +return data->len ==128 +128 ; + } + +return false; +} +static bool is_nat_proto_map (const struct expr *addr,uint8_t family) {const struct expr *mappings, *data;
@@ -1046,6 +1078,13 @@ static void netlink_parse_nat(struct netlink_parse_ctx *ctx, stmt->nat.addr = addr; } +if (is_nat_addr_map (addr, family)) { + stmt->nat.family = family; + stmt->nat.internal_flags |=STMT_NAT_F_INTERVAL ; + ctx->stmt = stmt; +return ; + } + reg2 =netlink_parse_register (nle,NFTNL_EXPR_NAT_REG_ADDR_MAX );if (reg2 && reg2 != reg1) { addr =netlink_get_register (ctx, loc, reg2);
src/netlink_linearize.c +8 -0
@@ -1117,6 +1117,14 @@ static void netlink_gen_nat_stmt(struct netlink_linearize_ctx *ctx,netlink_gen_expr (ctx, stmt->nat.addr, amin_reg);netlink_put_register (nle,NFTNL_EXPR_NAT_REG_ADDR_MIN , amin_reg); +if (stmt->nat.addr->etype ==EXPR_MAP && + stmt->nat.addr->mappings->set->data->flags &EXPR_F_INTERVAL ) { + amax_reg =get_register (ctx,NULL ); + registers++; + amin_reg +=netlink_register_space (nat_addrlen (family)); +netlink_put_register (nle,NFTNL_EXPR_NAT_REG_ADDR_MAX , + amin_reg); + } }if (stmt->nat.ipportmap) {
src/parser_bison.y +34 -0
@@ -1792,6 +1792,17 @@ map_block : /* empty */ { $$ = $<set>-1; } $1->flags |= NFT_SET_MAP; $$ = $1; } + | map_block TYPE + data_type_expr COLON INTERVAL data_type_expr + stmt_separator + { + $1->key = $3; + $1->data = $6; + $1->data->flags |= EXPR_F_INTERVAL; + + $1->flags |= NFT_SET_MAP; + $$ = $1; + } | map_block TYPEOF typeof_expr COLON typeof_expr stmt_separator
@@ -1803,6 +1814,18 @@ map_block : /* empty */ { $$ = $<set>-1; } $1->flags |= NFT_SET_MAP; $$ = $1; } + | map_block TYPEOF + typeof_expr COLON INTERVAL typeof_expr + stmt_separator + { + $1->key = $3; + datatype_set($1->key, $3->dtype); + $1->data = $6; + $1->data->flags |= EXPR_F_INTERVAL; + + $1->flags |= NFT_SET_MAP; + $$ = $1; + } | map_block TYPE data_type_expr COLON COUNTER stmt_separator
@@ -3171,6 +3194,17 @@ nat_stmt_args : stmt_expr $<stmt>0->nat.addr = $6; $<stmt>0->nat.ipportmap = true; } + | nf_key_proto INTERVAL TO stmt_expr + { + $<stmt>0->nat.family = $1; + $<stmt>0->nat.addr = $4; + $<stmt>0->nat.internal_flags = STMT_NAT_F_INTERVAL; + } + | INTERVAL TO stmt_expr + { + $<stmt>0->nat.addr = $3; + $<stmt>0->nat.internal_flags = STMT_NAT_F_INTERVAL; + } ; masq_stmt : masq_stmt_alloc masq_stmt_args
src/rule.c +3 -0
@@ -462,6 +462,9 @@ static void set_print_key_and_data(const struct set *set, struct output_ctx *octif (set_is_datamap (set->flags)) {nft_print (octx," : " ); +if (set->data->flags &EXPR_F_INTERVAL ) +nft_print (octx,"interval " ); +if (use_typeof)expr_print (set->data, octx);else
src/statement.c +2 -0
@@ -609,6 +609,8 @@ static void nat_stmt_print(const struct stmt *stmt, struct output_ctx *octx)if (stmt->nat.ipportmap)nft_print (octx," addr . port" ); +else if (stmt->nat.internal_flags &STMT_NAT_F_INTERVAL ) +nft_print (octx," interval" );nft_print (octx," to" ); }
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/3 include: resync nf_nat.h kernel header
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/linux/netfilter/nf_nat.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
include/linux/netfilter/nf_nat.h +12 -1
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _NETFILTER_NF_NAT_H#define _NETFILTER_NF_NAT_H
@@ -9,6 +10,7 @@#define NF_NAT_RANGE_PROTO_RANDOM (1 << 2)#define NF_NAT_RANGE_PERSISTENT (1 << 3)#define NF_NAT_RANGE_PROTO_RANDOM_FULLY (1 << 4) +#define NF_NAT_RANGE_PROTO_OFFSET (1 << 5)#define NF_NAT_RANGE_PROTO_RANDOM_ALL \ (NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PROTO_RANDOM_FULLY)
@@ -16,7 +18,7 @@#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) + NF_NAT_RANGE_PROTO_RANDOM_FULLY | NF_NAT_RANGE_PROTO_OFFSET)struct nf_nat_ipv4_range {unsigned int flags;
@@ -39,4 +41,13 @@ struct nf_nat_range { union nf_conntrack_man_proto max_proto; }; +struct nf_nat_range2 { +unsigned int flags; +union nf_inet_addr min_addr; +union nf_inet_addr max_addr; +union nf_conntrack_man_proto min_proto; +union nf_conntrack_man_proto max_proto; +union nf_conntrack_man_proto base_proto; +}; +#endif /* _NETFILTER_NF_NAT_H */
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 3/3 src: add netmap support
In reply to Pablo Neira AyusoThis patch allows you to specify an interval of IP address in maps.
table ip x {
chain y {
type nat hook postrouting priority srcnat; policy accept;
snat ip prefix to ip saddr map { 10.141.11.0/24 : 192.168.2.0/24 }
}}
The example above performs SNAT to packets that comes from 10.141.11.0/24 using the prefix 192.168.2.0/24, e.g. 10.141.11.4 is mangled to 192.168.2.4.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/linux/netfilter/nf_nat.h | 4 +++- include/statement.h | 1 + src/netlink_delinearize.c | 4 ++++ src/parser_bison.y | 17 +++++++++++++++++ src/statement.c | 2 ++ 5 files changed, 27 insertions(+), 1 deletion(-)
include/linux/netfilter/nf_nat.h +3 -1
@@ -11,6 +11,7 @@#define NF_NAT_RANGE_PERSISTENT (1 << 3)#define NF_NAT_RANGE_PROTO_RANDOM_FULLY (1 << 4)#define NF_NAT_RANGE_PROTO_OFFSET (1 << 5) +#define NF_NAT_RANGE_NETMAP (1 << 6)#define NF_NAT_RANGE_PROTO_RANDOM_ALL \ (NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PROTO_RANDOM_FULLY)
@@ -18,7 +19,8 @@#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 | NF_NAT_RANGE_PROTO_OFFSET) + NF_NAT_RANGE_PROTO_RANDOM_FULLY | NF_NAT_RANGE_PROTO_OFFSET | \ + NF_NAT_RANGE_NETMAP)struct nf_nat_ipv4_range {unsigned int flags;
include/statement.h +1 -0
@@ -121,6 +121,7 @@ extern const char *nat_etype2str(enum nft_nat_etypes type);enum {STMT_NAT_F_INTERVAL = (1 <<0 ), +STMT_NAT_F_PREFIX = (1 <<1 ), };struct nat_stmt {
src/netlink_delinearize.c +4 -0
@@ -15,6 +15,7 @@#include <limits.h> #include <linux/netfilter/nf_tables.h> #include <arpa/inet.h> +#include <linux/netfilter/nf_nat.h> #include <linux/netfilter.h> #include <net/ethernet.h> #include <netlink.h>
@@ -1060,6 +1061,9 @@ static void netlink_parse_nat(struct netlink_parse_ctx *ctx,if (nftnl_expr_is_set (nle,NFTNL_EXPR_NAT_FLAGS )) stmt->nat.flags =nftnl_expr_get_u32 (nle,NFTNL_EXPR_NAT_FLAGS ); +if (stmt->nat.flags &NF_NAT_RANGE_NETMAP ) + stmt->nat.internal_flags |=STMT_NAT_F_PREFIX ; + addr =NULL ; reg1 =netlink_parse_register (nle,NFTNL_EXPR_NAT_REG_ADDR_MIN );if (reg1) {
src/parser_bison.y +17 -0
@@ -3205,6 +3205,23 @@ nat_stmt_args : stmt_expr $<stmt>0->nat.addr = $3; $<stmt>0->nat.internal_flags = STMT_NAT_F_INTERVAL; } + | nf_key_proto PREFIX TO stmt_expr + { + $<stmt>0->nat.family = $1; + $<stmt>0->nat.addr = $4; + $<stmt>0->nat.internal_flags = + STMT_NAT_F_PREFIX | + STMT_NAT_F_INTERVAL; + $<stmt>0->nat.flags |= NF_NAT_RANGE_NETMAP; + } + | PREFIX TO stmt_expr + { + $<stmt>0->nat.addr = $3; + $<stmt>0->nat.internal_flags = + STMT_NAT_F_PREFIX | + STMT_NAT_F_INTERVAL; + $<stmt>0->nat.flags |= NF_NAT_RANGE_NETMAP; + } ; masq_stmt : masq_stmt_alloc masq_stmt_args
src/statement.c +2 -0
@@ -609,6 +609,8 @@ static void nat_stmt_print(const struct stmt *stmt, struct output_ctx *octx)if (stmt->nat.ipportmap)nft_print (octx," addr . port" ); +else if (stmt->nat.internal_flags &STMT_NAT_F_PREFIX ) +nft_print (octx," prefix" );else if (stmt->nat.internal_flags &STMT_NAT_F_INTERVAL )nft_print (octx," interval" );
Signature · 1 line
2.20.1