diff options
| author | Joakim Karlsson <oakimk@gmail.com> | 2020-01-11 23:05:10 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-01-14 07:52:52 +0000 |
| commit | 0ab71cc1ec50ae54cb33c95adf3c4c3aed71f550 (patch) | |
| tree | e1a64567660eb08f90d107308a25384fb12af2e6 /epan/dissectors/packet-json.c | |
| parent | 098077b6850a9b4cdcc4885b1442810ba984639a (diff) | |
json: append in Protocol column when call by another dissector
ex HTTP2/JSON
Change-Id: I1947a0d4739e41e03096a5b032656ebe858d2768
Reviewed-on: https://code.wireshark.org/review/35749
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-json.c')
| -rw-r--r-- | epan/dissectors/packet-json.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-json.c b/epan/dissectors/packet-json.c index 7f8f516dbb..e96f66a6e2 100644 --- a/epan/dissectors/packet-json.c +++ b/epan/dissectors/packet-json.c @@ -163,14 +163,16 @@ dissect_json(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) int offset; /* JSON dissector can be called in a JSON native file or when transported - * by another protocol. We set the column values only if they've not been - * already set by someone else. + * by another protocol, will make entry in the Protocol column on summary display accordingly */ wmem_list_frame_t *proto = wmem_list_frame_prev(wmem_list_tail(pinfo->layers)); if (proto) { const char *name = proto_get_protocol_filter_name(GPOINTER_TO_INT(wmem_list_frame_data(proto))); - if (!strcmp(name, "frame")) { + if (strcmp(name, "frame")) { + col_append_sep_str(pinfo->cinfo, COL_PROTOCOL, "/", "JSON"); + col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "JavaScript Object Notation"); + } else { col_set_str(pinfo->cinfo, COL_PROTOCOL, "JSON"); col_set_str(pinfo->cinfo, COL_INFO, "JavaScript Object Notation"); } |