From 7ecca3b785a67c5783ca61119d4490963837b0f0 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Sun, 24 Jan 2016 13:37:10 +0100 Subject: netlink: do binop postprocessing also for map lookups old nft list: mark set unknown unknown & 0xfff [invalid type] map { 3 : 0x00000017, 1 : 0x0000002a} new: mark set vlan id map { 3 : 0x00000017, 1 : 0x0000002a} Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- src/netlink_delinearize.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/netlink_delinearize.c') diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 724d52f7..76d598ca 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -1204,6 +1204,18 @@ static void binop_postprocess(struct rule_pp_ctx *ctx, struct expr *expr) } } +static void map_binop_postprocess(struct rule_pp_ctx *ctx, struct expr *expr) +{ + struct expr *binop = expr->left; + + if (binop->op != OP_AND) + return; + + if (binop->left->ops->type == EXPR_PAYLOAD && + binop->right->ops->type == EXPR_VALUE) + binop_postprocess(ctx, expr); +} + static void relational_binop_postprocess(struct rule_pp_ctx *ctx, struct expr *expr) { struct expr *binop = expr->left, *value = expr->right; @@ -1356,6 +1368,14 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp) switch (expr->ops->type) { case EXPR_MAP: + switch (expr->map->ops->type) { + case EXPR_BINOP: + map_binop_postprocess(ctx, expr); + break; + default: + break; + } + expr_postprocess(ctx, &expr->map); expr_postprocess(ctx, &expr->mappings); break; -- cgit v1.2.3