From 03956c54c85d97c3eb415fac19eddd9fa4932353 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Wed, 14 Aug 2019 13:34:52 +0200 Subject: src: json: support json restore for "th" pseudoheader Json output could not be restored back by nft because it did not recognize the new "th" pseudoheader. Fixes: a43a696443a150f44 ("proto: add pseudo th protocol to match d/sport in generic way") Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- src/parser_json.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/parser_json.c b/src/parser_json.c index 956233b9..d42bab70 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -503,7 +503,8 @@ static const struct proto_desc *proto_lookup_byname(const char *name) &proto_udplite, &proto_tcp, &proto_dccp, - &proto_sctp + &proto_sctp, + &proto_th, }; unsigned int i; @@ -519,11 +520,10 @@ static struct expr *json_parse_payload_expr(struct json_ctx *ctx, { const char *protocol, *field, *base; int offset, len, val; + struct expr *expr; if (!json_unpack(root, "{s:s, s:i, s:i}", "base", &base, "offset", &offset, "len", &len)) { - struct expr *expr; - if (!strcmp(base, "ll")) { val = PROTO_BASE_LL_HDR; } else if (!strcmp(base, "nh")) { @@ -553,7 +553,12 @@ static struct expr *json_parse_payload_expr(struct json_ctx *ctx, protocol, field); return NULL; } - return payload_expr_alloc(int_loc, proto, val); + expr = payload_expr_alloc(int_loc, proto, val); + + if (proto == &proto_th) + expr->payload.is_raw = true; + + return expr; } json_error(ctx, "Invalid payload expression properties."); return NULL; -- cgit v1.2.3