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/Makefile.nmake | |
| 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/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index f0ad957250..47d5bcca4b 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -71,6 +71,7 @@ libwireshark_LIBS = \ dfilter\dfilter.lib \ wmem\wmem.lib \ $(WSLUA_LIB) \ + jsmn\jsmn.lib \ nghttp2\nghttp2.lib \ dissectors\dissectors.lib @@ -91,17 +92,17 @@ DOXYGEN_DEP=doxygen !ENDIF !IFDEF ENABLE_LIBWIRESHARK -all: compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors libwireshark.dll +all: compress crypt ftypes dfilter wmem $(WSLUA_DIR) jsmn nghttp2 dissectors libwireshark.dll !ELSE -all: compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors libwireshark.lib +all: compress crypt ftypes dfilter wmem $(WSLUA_DIR) jsmn nghttp2 dissectors libwireshark.lib !ENDIF # For use when making libwireshark.dll libwireshark.lib: libwireshark.dll libwireshark.exp: libwireshark.dll -libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem\wmem.lib dissectors\dissectors.lib $(WSLUA_LIB) nghttp2\nghttp2.lib ..\image\libwireshark.res +libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) jsmn nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem\wmem.lib dissectors\dissectors.lib $(WSLUA_LIB) jsmn\jsmn.lib nghttp2\nghttp2.lib ..\image\libwireshark.res @echo Linking libwireshark.dll $(link) $(dlllflags) $(conlibsdll) shell32.lib psapi.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ @@ -111,8 +112,8 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfil dissectors\register.obj \ $(EXTRA_OBJECTS) -libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem\wmem.lib $(WSLUA_LIB) nghttp2\nghttp2.lib dissectors\dissectors.lib +libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) compress crypt ftypes dfilter wmem $(WSLUA_DIR) jsmn nghttp2 dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ + crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem\wmem.lib $(WSLUA_LIB) jsmn\jsmn.lib nghttp2\nghttp2.lib dissectors\dissectors.lib link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(EXTRA_OBJECTS) @@ -143,6 +144,8 @@ clean: clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../wslua $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd ../jsmn + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../nghttp2 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd .. @@ -179,6 +182,8 @@ distclean: distclean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../wslua $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean + cd ../jsmn + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../nghttp2 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd .. @@ -200,6 +205,8 @@ maintainer-clean: maintainer-clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../wslua $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../jsmn + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../nghttp2 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd .. @@ -239,6 +246,11 @@ wslua:: ..\config.h $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. +jsmn:: ..\config.h + cd jsmn + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake + cd .. + nghttp2:: ..\config.h cd nghttp2 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake |