From f1e8a129ee428419a0d5a45a2f410e8e4008d109 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Fri, 24 May 2019 15:06:47 +0200 Subject: src: Introduce chain_expr in jump and goto statements Introduce expressions as a chain in jump and goto statements. This is going to be used to support variables as a chain in the following patches. Signed-off-by: Fernando Fernandez Mancera Signed-off-by: Pablo Neira Ayuso --- src/json.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/json.c') diff --git a/src/json.c b/src/json.c index ff79b0cc..a503a975 100644 --- a/src/json.c +++ b/src/json.c @@ -673,14 +673,14 @@ json_t *verdict_expr_json(const struct expr *expr, struct output_ctx *octx) { NF_QUEUE, "queue", false }, }; const char *name = NULL; - const char *chain = NULL; + json_t *chain = NULL; unsigned int i; for (i = 0; i < array_size(verdict_tbl); i++) { if (expr->verdict == verdict_tbl[i].verdict) { name = verdict_tbl[i].name; if (verdict_tbl[i].chain && expr->chain) - chain = expr->chain; + chain = expr_print_json(expr->chain, octx); break; } } @@ -689,7 +689,7 @@ json_t *verdict_expr_json(const struct expr *expr, struct output_ctx *octx) return NULL; } if (chain) - return json_pack("{s:{s:s}}", name, "target", chain); + return json_pack("{s:{s:o}}", name, "target", chain); else return json_pack("{s:n}", name); } -- cgit v1.2.3