Wireshark-commits: [Wireshark-commits] master f53be88: JSON dissector changed into heuristic dissec
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 19 Jan 2015 03:12:05 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f53be88408a9004e0543d2a04c7bf5d7537c4796
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

f53be88 by Dario Lombardo (lomato@xxxxxxxxx):

    JSON dissector changed into heuristic dissector.
    
    To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT).
    TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part.
    
    HPFEEDS dissector has also been changed in order to leverage the new json dissector.
    
    Bug: 10834
    Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978
    Reviewed-on: https://code.wireshark.org/review/6350
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  119416e   TCAP: support dialogue confirmation
    adds  f53be88   JSON dissector changed into heuristic dissector.


Summary of changes:
 configure.ac                           |    1 +
 epan/CMakeLists.txt                    |   14 +-
 epan/Makefile.am                       |    8 +-
 epan/Makefile.nmake                    |   24 ++-
 epan/dissectors/packet-hpfeeds.c       |   81 +++-----
 epan/dissectors/packet-json.c          |   30 ++-
 epan/{nghttp2 => jsmn}/Makefile.am     |   18 +-
 epan/{nghttp2 => jsmn}/Makefile.common |   21 +-
 epan/{nghttp2 => jsmn}/Makefile.nmake  |   14 +-
 epan/jsmn/jsmn.c                       |  345 ++++++++++++++++++++++++++++++++
 epan/jsmn/jsmn.h                       |  111 ++++++++++
 11 files changed, 565 insertions(+), 102 deletions(-)
 copy epan/{nghttp2 => jsmn}/Makefile.am (86%)
 copy epan/{nghttp2 => jsmn}/Makefile.common (78%)
 copy epan/{nghttp2 => jsmn}/Makefile.nmake (67%)
 create mode 100644 epan/jsmn/jsmn.c
 create mode 100644 epan/jsmn/jsmn.h