URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4b5967f68391c9ea048c6ca76eef893e764d4779
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
4b5967f by Graham Bloice (graham.bloice@xxxxxxxxxxxxx):
Moved nghttp2 to epan
Cleaned up nghttp2 build
Change-Id: I9f7adc12936155e0ffc01ec825b5aff95279f97d
Reviewed-on: https://code.wireshark.org/review/2937
Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Tested-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
Actions performed:
from 5f0fd97 Wireshark Qt: Fix recent (update the list of file when quit Wireshark)
adds 4b5967f Moved nghttp2 to epan Cleaned up nghttp2 build
Summary of changes:
configure.ac | 2 +-
epan/CMakeLists.txt | 20 ++++-
epan/Makefile.am | 6 +-
epan/Makefile.nmake | 24 ++++--
epan/dissectors/packet-http2.c | 2 +-
{wsutil => epan}/nghttp2/Makefile.am | 0
{wsutil => epan}/nghttp2/Makefile.common | 4 +-
{wsutil => epan}/nghttp2/Makefile.nmake | 11 +--
epan/nghttp2/README.nghttp2 | 30 +++++++
{wsutil/nghttp2 => epan}/nghttp2/nghttp2.h | 55 ++----------
{wsutil => epan}/nghttp2/nghttp2_buf.c | 1 -
{wsutil => epan}/nghttp2/nghttp2_buf.h | 4 +-
{wsutil => epan}/nghttp2/nghttp2_hd.c | 0
{wsutil => epan}/nghttp2/nghttp2_hd.h | 2 +-
{wsutil => epan}/nghttp2/nghttp2_hd_huffman.c | 0
{wsutil => epan}/nghttp2/nghttp2_hd_huffman.h | 2 +-
{wsutil => epan}/nghttp2/nghttp2_hd_huffman_data.c | 0
{wsutil => epan}/nghttp2/nghttp2_helper.c | 0
{wsutil => epan}/nghttp2/nghttp2_helper.h | 2 +-
{wsutil => epan}/nghttp2/nghttp2_int.h | 0
{wsutil => epan}/nghttp2/nghttp2_net.h | 0
{wsutil/nghttp2 => epan}/nghttp2/nghttp2ver.h | 0
wsutil/CMakeLists.txt | 5 --
wsutil/Makefile.am | 4 -
wsutil/Makefile.nmake | 21 +----
wsutil/nghttp2/README.nghttp2 | 88 --------------------
26 files changed, 93 insertions(+), 190 deletions(-)
rename {wsutil => epan}/nghttp2/Makefile.am (100%)
rename {wsutil => epan}/nghttp2/Makefile.common (97%)
rename {wsutil => epan}/nghttp2/Makefile.nmake (76%)
create mode 100644 epan/nghttp2/README.nghttp2
rename {wsutil/nghttp2 => epan}/nghttp2/nghttp2.h (98%)
rename {wsutil => epan}/nghttp2/nghttp2_buf.c (99%)
rename {wsutil => epan}/nghttp2/nghttp2_buf.h (99%)
rename {wsutil => epan}/nghttp2/nghttp2_hd.c (100%)
rename {wsutil => epan}/nghttp2/nghttp2_hd.h (99%)
rename {wsutil => epan}/nghttp2/nghttp2_hd_huffman.c (100%)
rename {wsutil => epan}/nghttp2/nghttp2_hd_huffman.h (98%)
rename {wsutil => epan}/nghttp2/nghttp2_hd_huffman_data.c (100%)
rename {wsutil => epan}/nghttp2/nghttp2_helper.c (100%)
rename {wsutil => epan}/nghttp2/nghttp2_helper.h (99%)
rename {wsutil => epan}/nghttp2/nghttp2_int.h (100%)
rename {wsutil => epan}/nghttp2/nghttp2_net.h (100%)
rename {wsutil/nghttp2 => epan}/nghttp2/nghttp2ver.h (100%)
delete mode 100644 wsutil/nghttp2/README.nghttp2
