summaryrefslogtreecommitdiffstats
path: root/src/json.c
diff options
context:
space:
mode:
authorFernando Fernandez Mancera <ffmancera@riseup.net>2019-05-24 15:06:47 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2019-05-24 21:29:54 +0200
commitf1e8a129ee428419a0d5a45a2f410e8e4008d109 (patch)
tree7216ec99ab5873ca6706c766a04b4d0209efef90 /src/json.c
parent4b0f2a712b5792d2842d89fe68d4230e0eb05c7e (diff)
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 <ffmancera@riseup.net> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/json.c')
-rw-r--r--src/json.c6
1 files changed, 3 insertions, 3 deletions
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);
}