From 856b68c4fd13e869a19c76a2ac6532e5d024ce09 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Tue, 21 Jul 2020 13:10:17 +0200 Subject: evaluate: permit get element on maps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Its possible to add an element to a map, but you can't read it back: before: nft add element inet filter test "{ 18.51.100.17 . ad:c1:ac:c0:ce:c0 . 3761 : 0x42 }" nft get element inet filter test "{ 18.51.100.17 . ad:c1:ac:c0:ce:c0 . 3761 : 0x42 }" Error: No such file or directory; did you mean map ‘test’ in table inet ‘filter’? get element inet filter test { 18.51.100.17 . ad:c1:ac:c0:ce:c0 . 3761 : 0x42 } ^^^^ after: nft get element inet filter test "{ 18.51.100.17 . ad:c1:ac:c0:ce:c0 . 3761 : 0x42 }" table inet filter { map test { type ipv4_addr . ether_addr . inet_service : mark flags interval,timeout elements = { 18.51.100.17 . ad:c1:ac:c0:ce:c0 . 3761 : 0x00000042 } } } Signed-off-by: Florian Westphal --- src/evaluate.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/evaluate.c b/src/evaluate.c index 4ec91a1c..3e94e047 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -4188,20 +4188,8 @@ static int cmd_evaluate_delete(struct eval_ctx *ctx, struct cmd *cmd) static int cmd_evaluate_get(struct eval_ctx *ctx, struct cmd *cmd) { - struct table *table; - struct set *set; - switch (cmd->obj) { case CMD_OBJ_ELEMENTS: - table = table_lookup(&cmd->handle, &ctx->nft->cache); - if (table == NULL) - return table_not_found(ctx); - - set = set_lookup(table, cmd->handle.set.name); - if (set == NULL || set_is_map(set->flags)) - return set_not_found(ctx, &ctx->cmd->handle.set.location, - ctx->cmd->handle.set.name); - return setelem_evaluate(ctx, &cmd->expr); default: BUG("invalid command object type %u\n", cmd->obj); -- cgit v1.2.3