diff options
author | Phil Sutter <phil@nwl.cc> | 2018-08-29 16:23:24 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-08-30 12:19:36 +0200 |
commit | dfd72398d44ebbe17929d6e8ca0c870087a0c644 (patch) | |
tree | a4dbab2e4c814f99f7ffe2d4831a82ceb249c249 /src/json.c | |
parent | 8125785d5c5d35ec275e508166091d5472748bc1 (diff) |
JSON: Review payload expression
For raw payloads, property "name" is not needed, it's clearly identified
by base/offset/len properties.
In non-raw payload expressions, rename property "name" to "protocol" as
suggested during NFWS.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/json.c')
-rw-r--r-- | src/json.c | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -415,19 +415,14 @@ json_t *meta_expr_json(const struct expr *expr, struct output_ctx *octx) json_t *payload_expr_json(const struct expr *expr, struct output_ctx *octx) { - const struct proto_hdr_template *tmpl; - const struct proto_desc *desc; json_t *root; - desc = expr->payload.desc; - tmpl = expr->payload.tmpl; if (payload_is_known(expr)) root = json_pack("{s:s, s:s}", - "name", desc->name, - "field", tmpl->token); + "protocol", expr->payload.desc->name, + "field", expr->payload.tmpl->token); else - root = json_pack("{s:s, s:s, s:i, s:i}", - "name", "raw", + root = json_pack("{s:s, s:i, s:i}", "base", proto_base_tokens[expr->payload.base], "offset", expr->payload.offset, "len", expr->len); |