evaluate: copy field_count for anonymous object maps as well
Florian Westphal
maintainerPATCH 1/1 evaluate: copy field_count for anonymous object maps as well
test fails without this:
W: [FAILED] tests/shell/testcases/maps/anon_objmap_concat: got 134
BUG: invalid range expression type concat
nft: expression.c:1452: range_expr_value_low: Assertion `0' failed.
Signed-off-by Florian Westphal <[email protected]>
--- src/evaluate.c | 28 +++++++++++-------- tests/shell/testcases/maps/anon_objmap_concat | 6 ++++ .../maps/dumps/anon_objmap_concat.nft | 16 +++++++++++ 3 files changed, 39 insertions(+), 11 deletions(-) create mode 100755 tests/shell/testcases/maps/anon_objmap_concat create mode 100644 tests/shell/testcases/maps/dumps/anon_objmap_concat.nft
src/evaluate.c +17 -11
@@ -1513,6 +1513,20 @@ static int expr_evaluate_set(struct eval_ctx *ctx, struct expr **expr) }static int binop_transfer (struct eval_ctx *ctx,struct expr **expr); + +static void map_set_concat_info (struct expr *map) +{ + map->mappings->set->flags |= map->mappings->set->init->set_flags; + +if (map->mappings->set->flags &NFT_SET_INTERVAL && + map->map->etype ==EXPR_CONCAT ) { +memcpy (&map->mappings->set->desc.field_len, &map->map->field_len, +sizeof (map->mappings->set->desc.field_len)); + map->mappings->set->desc.field_count = map->map->field_count; + map->mappings->flags |=NFT_SET_CONCAT ; + } +} +static int expr_evaluate_map (struct eval_ctx *ctx,struct expr **expr) {struct expr_ctx ectx = ctx->ectx;
@@ -1580,15 +1594,8 @@ static int expr_evaluate_map(struct eval_ctx *ctx, struct expr **expr) ctx->set->key->len = ctx->ectx.len; ctx->set =NULL ; map = *expr; - map->mappings->set->flags |= map->mappings->set->init->set_flags; - -if (map->mappings->set->flags &NFT_SET_INTERVAL && - map->map->etype ==EXPR_CONCAT ) { -memcpy (&map->mappings->set->desc.field_len, &map->map->field_len, -sizeof (map->mappings->set->desc.field_len)); - map->mappings->set->desc.field_count = map->map->field_count; - map->mappings->flags |=NFT_SET_CONCAT ; - } + +map_set_concat_info (map);break ;case EXPR_SYMBOL :if (expr_evaluate (ctx, &map->mappings) <0 )
@@ -3751,8 +3758,7 @@ static int stmt_evaluate_objref_map(struct eval_ctx *ctx, struct stmt *stmt)return -1 ; ctx->set =NULL ; - map->mappings->set->flags |= - map->mappings->set->init->set_flags; +map_set_concat_info (map);/* fall through */ case EXPR_SYMBOL :if (expr_evaluate (ctx, &map->mappings) <0 )
tests/shell/testcases/maps/anon_objmap_concat new file +6 -0
@@ -0,0 +1,6 @@ +#!/bin/bash + +set -e +dumpfile=$(dirname $0)/dumps/$(basename $0).nft + +$NFT -f "$dumpfile"
tests/shell/testcases/maps/dumps/anon_objmap_concat.nft new file +16 -0
@@ -0,0 +1,16 @@ +table inet filter { + ct helper sip-5060u { + type "sip" protocol udp + l3proto ip + } + + ct helper sip-5060t { + type "sip" protocol tcp + l3proto ip + } + + chain input { + type filter hook input priority filter; policy accept; + ct helper set ip protocol . th dport map { udp . 10000-20000 : "sip-5060u", tcp . 10000-20000 : "sip-5060t" } + } +}
Signature · 1 line
2.34.1