From d4bd008be257cc95b2e9625cc5506b9e925c766d Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 8 Jun 2018 17:27:13 +0200 Subject: JSON: Call verdict maps 'vmap' in JSON as well This way JSON format is more consistent with the standard one. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/json.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/json.c') diff --git a/src/json.c b/src/json.c index b6e6ca9c..306cab7b 100644 --- a/src/json.c +++ b/src/json.c @@ -560,7 +560,13 @@ json_t *mapping_expr_json(const struct expr *expr, struct output_ctx *octx) json_t *map_expr_json(const struct expr *expr, struct output_ctx *octx) { - return json_pack("{s:{s:o, s:o}}", "map", + const char *type = "map"; + + if (expr->mappings->ops->type == EXPR_SET_REF && + expr->mappings->set->datatype->type == TYPE_VERDICT) + type = "vmap"; + + return json_pack("{s:{s:o, s:o}}", type, "left", expr_print_json(expr->map, octx), "right", expr_print_json(expr->mappings, octx)); } -- cgit v1.2.3