2 files changed, 16 insertions, 25 deletions

diff --git a/src/json.c b/src/json.c
index 4af8ee8e..2a13dfe7 100644
--- a/src/json.c
+++ b/src/json.c
@@ -385,19 +385,10 @@ json_t *binop_expr_json(const struct expr *expr, struct output_ctx *octx)
 
 json_t *relational_expr_json(const struct expr *expr, struct output_ctx *octx)
 {
-	json_t *tmp;
-
-	tmp = json_pack("{s:o, s:o}",
-			"left", expr_print_json(expr->left, octx),
-			"right", expr_print_json(expr->right, octx));
-	/* XXX: check taken from binop_expr_print()
-	 *      if right is range, op is OP_EQ which in turn crashes nft if fed with it */
-	if (expr_op_symbols[expr->op] &&
-	    (expr->op != OP_EQ || must_print_eq_op(expr)))
-		json_object_set_new(tmp, "op",
-				    json_string(expr_op_symbols[expr->op]));
-
-	return json_pack("{s:o}", "match", tmp);
+	return json_pack("{s:{s:s, s:o, s:o}}", "match",
+			 "op", expr_op_symbols[expr->op] ? : "in",
+			 "left", expr_print_json(expr->left, octx),
+			 "right", expr_print_json(expr->right, octx));
 }
 
 json_t *range_expr_json(const struct expr *expr, struct output_ctx *octx)
diff --git a/src/parser_json.c b/src/parser_json.c
index 2f7e0a3e..6870434e 100644
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -1363,24 +1363,24 @@ static struct stmt *json_parse_match_stmt(struct json_ctx *ctx,
 	const char *opstr = NULL;
 	enum ops op;
 
-	if (json_unpack_err(ctx, value, "{s:o, s:o}",
+	if (json_unpack_err(ctx, value, "{s:o, s:o, s:s}",
 			    "left", &jleft,
-			    "right", &jright))
+			    "right", &jright,
+			    "op", &opstr))
 		return NULL;
 
-	json_unpack(value, "{s:s}", "op", &opstr);
-	if (opstr) {
-		for (op = OP_INVALID; op < __OP_MAX; op++) {
-			if (expr_op_symbols[op] &&
-			    !strcmp(opstr, expr_op_symbols[op]))
-				break;
-		}
-		if (op == __OP_MAX) {
+	for (op = OP_INVALID; op < __OP_MAX; op++) {
+		if (expr_op_symbols[op] &&
+		    !strcmp(opstr, expr_op_symbols[op]))
+			break;
+	}
+	if (op == __OP_MAX) {
+		if (!strcmp(opstr, "in")) {
+			op = OP_IMPLICIT;
+		} else {
 			json_error(ctx, "Unknown relational op '%s'.", opstr);
 			return NULL;
 		}
-	} else {
-		op = OP_IMPLICIT;
 	}
 
 	left = json_parse_expr(ctx, jleft);