diff options
| author | Dario Lombardo <lomato@gmail.com> | 2015-01-02 21:33:49 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-19 03:12:01 +0000 |
| commit | f53be88408a9004e0543d2a04c7bf5d7537c4796 (patch) | |
| tree | 35c9b28fc5fc63acc7655472db14507a69b96503 /epan/CMakeLists.txt | |
| parent | 119416ef2765f290b4cdaaf930438f9b603abd9c (diff) | |
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@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/CMakeLists.txt')
| -rw-r--r-- | epan/CMakeLists.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 855f28d598..ccbae86d20 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1514,6 +1514,11 @@ set(WMEM_FILES ) source_group(wmem FILES ${WMEM_FILES}) +set(JSMN_FILES + jsmn/jsmn.c +) +source_group(jsmn FILES ${JSMN_FILES}) + set(NGHTTP2_FILES nghttp2/nghttp2_buf.c nghttp2/nghttp2_hd.c @@ -1686,6 +1691,7 @@ set(CLEAN_FILES ${DISSECTOR_SUPPORT_SRC} ${LIBWIRESHARK_ASM_FILES} ${WMEM_FILES} + ${JSMN_FILES} ${NGHTTP2_FILES} ${WSLUA_FILES} ) @@ -1708,6 +1714,7 @@ add_library(epan ${LINK_MODE_LIB} ${DFILTER_FILES} ${FTYPE_FILES} ${WMEM_FILES} + ${JSMN_FILES} ${NGHTTP2_FILES} ${WSLUA_FILES} ${DISSECTOR_FILES} @@ -1737,6 +1744,7 @@ file(GLOB DFILTER_HEADERS dfilter/*.h ../tools/lemon/cppmagic.h) file(GLOB D_HEADERS dissectors/*.h) file(GLOB FTYPES_HEADERS ftypes/*.h) file(GLOB WMEM_HEADERS wmem/*.h) +file(GLOB JSMN_HEADERS jsmn/*.h) file(GLOB NGHTTP2_HEADERS nghttp2/*.h) file(MAKE_DIRECTORY ${ABICHECK_TMPDIR} ${ABICHECK_TMPDIR}/epan @@ -1746,6 +1754,7 @@ file(MAKE_DIRECTORY ${ABICHECK_TMPDIR} ${ABICHECK_TMPDIR}/dissectors ${ABICHECK_TMPDIR}/ftypes ${ABICHECK_TMPDIR}/wmem + ${ABICHECK_TMPDIR}/jsmn ${ABICHECK_TMPDIR}/nghttp2) file(COPY ../color.h ../register.h DESTINATION ${ABICHECK_TMPDIR}) @@ -1756,6 +1765,7 @@ file(COPY ${DFILTER_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/dfilter) file(COPY ${D_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/dissectors) file(COPY ${FTYPES_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/ftypes) file(COPY ${WMEM_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/wmem) +file(COPY ${JSMN_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/jsmn) file(COPY ${NGHTTP2_HEADERS} DESTINATION ${ABICHECK_TMPDIR}/nghttp2) add_custom_command(OUTPUT libwireshark.abi.tar.gz @@ -1772,10 +1782,10 @@ add_custom_command(OUTPUT libwireshark.abi.tar.gz ${ABICHECK_TMPDIR}/epan/* ${ABICHECK_TMPDIR}/compress/* ${ABICHECK_TMPDIR}/dfilter/* ${ABICHECK_TMPDIR}/dissectors/* ${ABICHECK_TMPDIR}/ftypes/* ${ABICHECK_TMPDIR}/wmem/* - ${ABICHECK_TMPDIR}/nghttp2/* + ${ABICHECK_TMPDIR}/jsmn/* ${ABICHECK_TMPDIR}/nghttp2/* DEPENDS ${HEADERS} ${CRYPT_HEADERS} ${COMPRESS_HEADERS} ${DFILTER_HEADERS} ${D_HEADERS} - ${FTYPES_HEADERS} ${WMEM_HEADERS} ${NGHTTP2_HEADERS} epan) + ${FTYPES_HEADERS} ${WMEM_HEADERS} ${JSMN_HEADERS} ${NGHTTP2_HEADERS} epan) # By default the name for a library with target name epan will be libepan, # but Ethereal is now named Wireshark |