Wireshark-commits: [Wireshark-commits] master 0ab71cc: json: append in Protocol column when call by

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 14 Jan 2020 07:53:01 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0ab71cc1ec50ae54cb33c95adf3c4c3aed71f550
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

0ab71cc by Joakim Karlsson (oakimk@xxxxxxxxx):

    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@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  098077b   FTDI FT: Dissect SetBitMode command
     add  0ab71cc   json: append in Protocol column when call by another dissector


Summary of changes:
 epan/dissectors/packet-json.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)