diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-07-13 20:18:15 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-07-13 20:21:32 +0200 |
| commit | 9b169bfc650ebeb81aff80ba2bf87d729dc3143e (patch) | |
| tree | a1d74be596b5d715a80cdac6f460ace1ea556115 /src/evaluate.c | |
| parent | b73ff88cf011ec53ee66a9b1a99b34aea0db63f4 (diff) | |
src: remove STMT_NAT_F_INTERVAL flags and interval keyword
STMT_NAT_F_INTERVAL is not useful, the keyword interval can be removed
to simplify the syntax, e.g.
snat to ip saddr map { 10.141.11.4 : 192.168.2.2-192.168.2.4 }
This patch reworks 9599d9d25a6b ("src: NAT support for intervals in
maps").
Do not remove STMT_NAT_F_INTERVAL yet since this flag is needed for
interval concatenations coming in a follow up patch.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/evaluate.c')
| -rw-r--r-- | src/evaluate.c | 20 |
1 files changed, 0 insertions, 20 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) |