diff options
| author | Florian Westphal <fw@strlen.de> | 2023-12-13 17:29:50 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-12-13 18:11:10 +0100 |
| commit | c0194279d356f942e81555262e41264af7659a1f (patch) | |
| tree | 623561d2e3fba73fe477e4f396733f55e0dc018b /src/evaluate.c | |
| parent | 3eb0a73a9ee32897290d4097c0ec29377e25859e (diff) | |
evaluate: error out when existing set has incompatible key
Before:
BUG: invalid range expression type symbol
nft: expression.c:1494: range_expr_value_high: Assertion `0' failed.
After:
range_expr_value_high_assert:5:20-27: Error: Could not resolve protocol name
elements = { 100-11.0.0.0, }
^^^^^^^^
range_expr_value_high_assert:7:6-7: Error: set definition has conflicting key (ipv4_addr vs inet_proto)
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/evaluate.c')
| -rw-r--r-- | src/evaluate.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index da382912..8173d153 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -4761,6 +4761,9 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set) existing_set = set_cache_find(table, set->handle.set.name); if (!existing_set) set_cache_add(set_get(set), table); + else if (!datatype_equal(existing_set->key->dtype, set->key->dtype)) + return set_error(ctx, set, "%s definition has conflicting key (%s vs %s)\n", + type, set->key->dtype->name, existing_set->key->dtype->name); if (existing_set && existing_set->flags & NFT_SET_EVAL) { uint32_t existing_flags = existing_set->flags & ~NFT_SET_EVAL; |