evaluate: error out on meter overlap with an existing set/map declaration
Pablo Neira Ayuso
maintainerPATCH 1/1 evaluate: error out on meter overlap with an existing set/map declaration
One of the problems with meters is that they use the set/map infrastructure behind the scenes which might be confusing to users.
This patch errors out in case user declares a meter whose name overlaps with an existing set/map:
meter.nft:15:18-91: Error: File exists; meter ‘syn4-meter’ overlaps an existing set ‘syn4-meter’ in family inet
tcp dport 22 meter syn4-meter { ip saddr . tcp dport timeout 5m limit rate 20/minute } counter accept
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
An old 5.10 kernel bails out simply with EEXIST, with this patch a better hint is provided.
Dynamic sets are preferred over meters these days.
--- src/evaluate.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
src/evaluate.c +18 -0
@@ -3037,6 +3037,24 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)static int stmt_evaluate_meter (struct eval_ctx *ctx,struct stmt *stmt) {struct expr *key, *set, *setref; +struct set *existing_set; +struct table *table; + + table =table_cache_find (&ctx->nft->cache.table_cache, + ctx->cmd->handle.table.name, + ctx->cmd->handle.family); +if (table ==NULL ) +return table_not_found (ctx); + + existing_set =set_cache_find (table, stmt->meter.name); +if (existing_set) +return cmd_error (ctx, &stmt->location, +"%s; meter ‘%s’ overlaps an existing %s ‘%s’ in family %s" , +strerror (EEXIST ), + stmt->meter.name, +set_is_map (existing_set->flags) ?"map" :"set" , + existing_set->handle.set.name, +family2str (existing_set->handle.family));expr_set_context (&ctx->ectx,NULL ,0 );if (expr_evaluate (ctx, &stmt->meter.key) <0 )
Signature · 1 line
2.30.2