From cbbdb960a262d8df86a2dfaa1b56c0182e97f3ed Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 11 Sep 2018 22:14:26 +0200 Subject: json: Print range expressions numerically This applies the same change as in commit 85b1e3c0052ef ("src: Always print range expressions numerically") to JSON output for consistency. Signed-off-by: Phil Sutter Signed-off-by: Florian Westphal --- src/json.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/json.c b/src/json.c index c0fc4226..1708f22d 100644 --- a/src/json.c +++ b/src/json.c @@ -393,9 +393,15 @@ json_t *relational_expr_json(const struct expr *expr, struct output_ctx *octx) json_t *range_expr_json(const struct expr *expr, struct output_ctx *octx) { - return json_pack("{s:[o, o]}", "range", + json_t *root; + + octx->numeric += NFT_NUMERIC_ALL + 1; + root = json_pack("{s:[o, o]}", "range", expr_print_json(expr->left, octx), expr_print_json(expr->right, octx)); + octx->numeric -= NFT_NUMERIC_ALL + 1; + + return root; } json_t *meta_expr_json(const struct expr *expr, struct output_ctx *octx) -- cgit v1.2.3