diff options
-rw-r--r-- | src/evaluate.c | 20 | ||||
-rw-r--r-- | src/json.c | 2 | ||||
-rw-r--r-- | src/netlink_delinearize.c | 1 | ||||
-rw-r--r-- | src/parser_bison.y | 8 | ||||
-rw-r--r-- | src/statement.c | 2 | ||||
-rw-r--r-- | tests/py/ip/snat.t | 2 | ||||
-rw-r--r-- | tests/py/ip/snat.t.payload | 2 | ||||
-rwxr-xr-x | tests/shell/testcases/sets/0047nat_0 | 2 | ||||
-rw-r--r-- | tests/shell/testcases/sets/dumps/0047nat_0.nft | 2 |
9 files changed, 6 insertions, 35 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index dbc773d1..13888e5b 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -3200,26 +3200,6 @@ static int stmt_evaluate_nat(struct eval_ctx *ctx, struct stmt *stmt) return err; } - if (stmt->nat.type_flags & STMT_NAT_F_INTERVAL) { - switch (stmt->nat.addr->etype) { - case EXPR_MAP: - if (!(stmt->nat.addr->mappings->set->data->flags & EXPR_F_INTERVAL)) - return expr_error(ctx->msgs, stmt->nat.addr, - "map is not defined as interval"); - break; - case EXPR_RANGE: - case EXPR_PREFIX: - break; - default: - return expr_error(ctx->msgs, stmt->nat.addr, - "neither prefix, range nor map expression"); - } - - stmt->flags |= STMT_F_TERMINAL; - - return 0; - } - if (stmt->nat.proto != NULL) { err = nat_evaluate_transport(ctx, stmt, &stmt->nat.proto); if (err < 0) @@ -1329,8 +1329,6 @@ static json_t *nat_type_flags_json(uint32_t type_flags) { json_t *array = json_array(); - if (type_flags & STMT_NAT_F_INTERVAL) - json_array_append_new(array, json_string("interval")); if (type_flags & STMT_NAT_F_PREFIX) json_array_append_new(array, json_string("prefix")); if (type_flags & STMT_NAT_F_CONCAT) diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index fd994b8b..a4ae938a 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -1119,7 +1119,6 @@ static void netlink_parse_nat(struct netlink_parse_ctx *ctx, if (is_nat_addr_map(addr, family)) { stmt->nat.family = family; - stmt->nat.type_flags |= STMT_NAT_F_INTERVAL; ctx->stmt = stmt; return; } diff --git a/src/parser_bison.y b/src/parser_bison.y index 872d7cdb..790cd832 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -3623,28 +3623,24 @@ nat_stmt_args : stmt_expr { $<stmt>0->nat.family = $1; $<stmt>0->nat.addr = $4; - $<stmt>0->nat.type_flags = STMT_NAT_F_INTERVAL; } | INTERVAL TO stmt_expr { $<stmt>0->nat.addr = $3; - $<stmt>0->nat.type_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.type_flags = - STMT_NAT_F_PREFIX | - STMT_NAT_F_INTERVAL; + STMT_NAT_F_PREFIX; $<stmt>0->nat.flags |= NF_NAT_RANGE_NETMAP; } | PREFIX TO stmt_expr { $<stmt>0->nat.addr = $3; $<stmt>0->nat.type_flags = - STMT_NAT_F_PREFIX | - STMT_NAT_F_INTERVAL; + STMT_NAT_F_PREFIX; $<stmt>0->nat.flags |= NF_NAT_RANGE_NETMAP; } ; diff --git a/src/statement.c b/src/statement.c index dfd27510..6db7e397 100644 --- a/src/statement.c +++ b/src/statement.c @@ -677,8 +677,6 @@ static void nat_stmt_print(const struct stmt *stmt, struct output_ctx *octx) nft_print(octx, " addr . port"); else if (stmt->nat.type_flags & STMT_NAT_F_PREFIX) nft_print(octx, " prefix"); - else if (stmt->nat.type_flags & STMT_NAT_F_INTERVAL) - nft_print(octx, " interval"); nft_print(octx, " to"); } diff --git a/tests/py/ip/snat.t b/tests/py/ip/snat.t index c6e8a8e6..56ab943e 100644 --- a/tests/py/ip/snat.t +++ b/tests/py/ip/snat.t @@ -10,5 +10,5 @@ iifname "eth0" tcp dport != {80, 90, 23} snat to 192.168.3.2;ok iifname "eth0" tcp dport != 23-34 snat to 192.168.3.2;ok snat ip addr . port to ip saddr map { 10.141.11.4 : 192.168.2.3 . 80 };ok -snat ip interval to ip saddr map { 10.141.11.4 : 192.168.2.2-192.168.2.4 };ok +snat ip to ip saddr map { 10.141.11.4 : 192.168.2.2-192.168.2.4 };ok snat ip prefix to ip saddr map { 10.141.11.0/24 : 192.168.2.0/24 };ok diff --git a/tests/py/ip/snat.t.payload b/tests/py/ip/snat.t.payload index ef4c1ce9..2a03ff1f 100644 --- a/tests/py/ip/snat.t.payload +++ b/tests/py/ip/snat.t.payload @@ -69,7 +69,7 @@ ip [ lookup reg 1 set __map%d dreg 1 ] [ nat snat ip addr_min reg 1 proto_min reg 9 ] -# snat ip interval to ip saddr map { 10.141.11.4 : 192.168.2.2-192.168.2.4 } +# snat ip to ip saddr map { 10.141.11.4 : 192.168.2.2-192.168.2.4 } __map%d test-ip4 b size 1 __map%d test-ip4 0 element 040b8d0a : 0202a8c0 0402a8c0 0 [end] diff --git a/tests/shell/testcases/sets/0047nat_0 b/tests/shell/testcases/sets/0047nat_0 index 746a6b6d..cb1d4d68 100755 --- a/tests/shell/testcases/sets/0047nat_0 +++ b/tests/shell/testcases/sets/0047nat_0 @@ -10,7 +10,7 @@ EXPECTED="table ip x { chain y { type nat hook postrouting priority srcnat; policy accept; - snat ip interval to ip saddr map @y + snat to ip saddr map @y } } " diff --git a/tests/shell/testcases/sets/dumps/0047nat_0.nft b/tests/shell/testcases/sets/dumps/0047nat_0.nft index 70730ef3..e7968054 100644 --- a/tests/shell/testcases/sets/dumps/0047nat_0.nft +++ b/tests/shell/testcases/sets/dumps/0047nat_0.nft @@ -8,6 +8,6 @@ table ip x { chain y { type nat hook postrouting priority srcnat; policy accept; - snat ip interval to ip saddr map @y + snat ip to ip saddr map @y } } |