diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-08-24 09:52:17 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-08-24 09:52:17 +0200 |
commit | 0e90798e98121abab274434ec60f0b873f510021 (patch) | |
tree | ea0785039aafd7129fa7e39e6df0778cd0a9fcf7 /src/netlink_delinearize.c | |
parent | 03302da063b032e531d8c748d698f03667658645 (diff) |
src: simplify map statement
Instead of using the map expression, store dynamic key and data
separately since they need special handling than constant maps.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/netlink_delinearize.c')
-rw-r--r-- | src/netlink_delinearize.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index dbf1f618..898c737f 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -1321,7 +1321,8 @@ static void netlink_parse_dynset(struct netlink_parse_ctx *ctx, } else if (expr_data != NULL) { stmt = map_stmt_alloc(loc); stmt->map.set = set_ref_expr_alloc(loc, set); - stmt->map.map = map_expr_alloc(loc, expr, expr_data); + stmt->map.key = expr; + stmt->map.data = expr_data; stmt->map.op = nftnl_expr_get_u32(nle, NFTNL_EXPR_DYNSET_OP); } else { stmt = set_stmt_alloc(loc); @@ -2508,6 +2509,10 @@ static void rule_parse_postprocess(struct netlink_parse_ctx *ctx, struct rule *r case STMT_SET: expr_postprocess(&rctx, &stmt->set.key); break; + case STMT_MAP: + expr_postprocess(&rctx, &stmt->map.key); + expr_postprocess(&rctx, &stmt->map.data); + break; case STMT_DUP: if (stmt->dup.to != NULL) expr_postprocess(&rctx, &stmt->dup.to); |