summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-10-04Update capture_opts in extcap_cleanup().Tomasz Moń3-26/+22
This fixes redundant extcap_pid handle close that could occur in capture_opts_del_iface() which resulted in unhandled exception on Windows. Change-Id: I06b680fcb65cd6fd854a25fb1b01248dce3251a1 Reviewed-on: https://code.wireshark.org/review/4447 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-04Wait for extcap to connect to pipe on Windows.Tomasz Moń2-2/+129
This prevents dumpcap from failing with timeout exceeded error message with some extcaps (especially those that display UAC screen) by making sure that extcap connects to pipe before dumpcap is even started. Change-Id: I549da9217c7f4ae89509330ca4fa613a119a9523 Reviewed-on: https://code.wireshark.org/review/4428 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-04Use some macros to clean up the Snifer decompression code.Guy Harris1-92/+91
For code that's used in more than one place, use macros. This combines a bunch of checks into the output macros. Change-Id: Ic32dce75e1c531fd28bfed180856e230277bfe58 Reviewed-on: https://code.wireshark.org/review/4451 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-03Fix memory leak and heap corruption on Windows.Tomasz Moń1-6/+6
LPSECURITY_ATTRIBUTES is type definition for pointer to SECURITY_ATTRIBUTES structure. Change-Id: I94a835bfd8f7eb76c808fac8286ca3f2db9b19c3 Reviewed-on: https://code.wireshark.org/review/4449 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-03WSDG: Update the Windows Qt download text.Gerald Combs1-15/+6
Change-Id: I6fd027ff76b5b463f33992898965a3e037778071 Reviewed-on: https://code.wireshark.org/review/4443 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-03Add editor modelines; Adjust whitespace as needed.Bill Meier42-3708/+4251
Change-Id: I391cdf80a6e4ae5b0f4068e0500a90d013588f8a Reviewed-on: https://code.wireshark.org/review/4442 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03packet-aim-messaging.c: Add editor modelines; reformat various (including ↵Bill Meier1-105/+176
hf[] entries). Change-Id: Ie5973a717a80ba75b82e817cb9e30c3529afbb0c Reviewed-on: https://code.wireshark.org/review/4441 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03packet-dcerpc-fileexp.c: Add editor modelines; reformat various (including ↵Bill Meier1-1378/+1934
hf[] entries). Change-Id: I0d49f4c1c3a3960c3fdc9b1cd411c73097829c09 Reviewed-on: https://code.wireshark.org/review/4440 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-03LocationNumber digits is off by one(to many).AndersBroman2-6/+6
Bug 10522. Change-Id: I7887f3ee229ac22d2aa37a3d8900d76d8b814ed0 Reviewed-on: https://code.wireshark.org/review/4439 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-03Create field filters for gsm_rr_csn_HL_flag() usages.Michael Mann1-95/+188
Change-Id: I74f110b477a3bf7e0c374db3147604d50018deba Reviewed-on: https://code.wireshark.org/review/4435 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-03Re-enable the Wireshark test suite.Gerald Combs1-1/+1
Change-Id: Icfd9edb8c6ef7620878bc9d60c8dcc569ad2abad Reviewed-on: https://code.wireshark.org/review/4434 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02CMake: Don't assume we have a "cat" command.Gerald Combs1-6/+25
Use "copy /B" on Windows to create wireshark.pod, similar to doc/Makefile.nmake. Change-Id: I454afca0bd3497cca795ca18256dd7c4e2f224d4 Reviewed-on: https://code.wireshark.org/review/4415 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02Partially re-enable Wireshark tests.Gerald Combs2-3/+6
Qt requires Xrender and XKEYBOARD. Unfortunately the Ubuntu and Solaris buildbots run the test script under Xtightvnc, which provides neither of those. Only enable the tests on Windows and OS X for now. Change-Id: I84bc28f810782b862b4dca8fc8df088a4919066d Reviewed-on: https://code.wireshark.org/review/4430 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02Add editor modelines & adjust indentation/whitespace as needed.Bill Meier47-9435/+10053
Change-Id: Ice2d93632cd42dfcef3bfbf0e15f2a8a147278fc Reviewed-on: https://code.wireshark.org/review/4433 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-02Reformat hf[] entries; Add editor modelines & adjust whitespace.Bill Meier4-1449/+2459
Change-Id: I30b25db89d3fbae5f3913ede8bf7bd66fd2516da Reviewed-on: https://code.wireshark.org/review/4432 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-02packet-nfs.c: (trivial) Add dropped/missing newline; Adjust some whitespace.Bill Meier1-169/+170
Change-Id: I2ef3af42a712ced6917d94e1dcf708b3f34d7e82 Reviewed-on: https://code.wireshark.org/review/4431 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-02Fix the release notes.Gerald Combs1-2/+3
The Bug Fixes section is empty, which creates an empty Docbook section, which isn't allowed. Comment out its header for now. AsciiDoc interprets single quoted text as emphasized, which probably isn't what was intended. Use curly quote markup instead. Add a link to the AsciiDoc cheat sheet. Change-Id: Ib9746ea714f90a28a2f1204e97e9e185aaef3df6 Reviewed-on: https://code.wireshark.org/review/4429 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02epl: FIX PDO_MappingLukas Emersberger1-12/+43
The subindex of the R/TPDO frames was interpreted false. Now the subindex is correctly interpreted. ASend SDO Write Multiple Parameter by Index interpreted the mapping data false. Change-Id: Icfb1896e96f5486c5479c1dd060eb1032695f9f6 Reviewed-on: https://code.wireshark.org/review/4397 Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-02Upgrade GnuTLS 3.2.15 / Gcrypt 1.6.2 packagePascal Quantin2-4/+5
We bundle a recompiled libcrypt library without AES-NI support so as to workaround a memory corruption seen when configuring AES keys Bug: 10476 Change-Id: I7735343530ec90b7b67ece4c6eb5b4bf1ddb857e Reviewed-on: https://code.wireshark.org/review/4401 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-02Create field filters for gsm_rr_csn_flag() usages.Michael Mann1-278/+676
Change-Id: I77b0c33c054397666f978a9ae175fa386cb87b59 Reviewed-on: https://code.wireshark.org/review/4419 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-02Add dissection of IS-IS Router CAPABILITY TLV.AndersBroman2-7/+92
Bug 10520. Change-Id: I8d8d56e36d90088af3cd7d2490f95c5f87c75423 Reviewed-on: https://code.wireshark.org/review/4420 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-02Qt: Keep dialogs from blocking tests.Gerald Combs2-11/+10
If WIRESHARK_QUIT_AFTER_CAPTURE is set, call exit(0). This keeps us from emitting the aboutToQuit signal and doing things that might pop up dialogs. Change-Id: I6e986b6e7ad824d8b5258e34a12c32869f5b2d34 Reviewed-on: https://code.wireshark.org/review/4421 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02Some Release Notes cleanup.Jeff Morriss2-173/+48
- Don't list bugs which were fixed in 1.12 as being fixed in 1.99. (We probably should add some bugs to the bugs-fixed list.) - Remove new-features list for everything prior to 1.12 (so we only list improvements since 1.12). - Fix bug link to bug 1814. - Fix the wiki's URL (the wiki doesn't appear to support https today). - Remove bugs 4445 and 9242 from the Known Problems list: they've been fixed. Change-Id: Ideb9ddf24e429ee00c19ac975370aa4fe81e652b Reviewed-on: https://code.wireshark.org/review/4403 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-10-02Extend X11 response parsingMichele Baldessari4-2/+267
Add support to parse screens, depths, visual-types and pixel-formats in the X11 connection initial response. v1->v2: - Do not show unused bytes when their length is 0 - Fix up tabs Change-Id: If62f0eab65a18e050fb3f830a6bd7574ab1f2de6 Reviewed-on: https://code.wireshark.org/review/4249 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-02Temporarily disable the Qt tests added in g58cde5c.Gerald Combs2-2/+2
Apparently what works for me doesn't work for the Buildbot users. Change-Id: I7d3e4f2b89ae8ae3dadc8d92438c0e1923b97ace Reviewed-on: https://code.wireshark.org/review/4416 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01Add tests for the Qt UI.Gerald Combs7-5/+63
Make sure the Qt UI quits if WIRESHARK_QUIT_AFTER_CAPTURE is set. Make sure Bourne shell scripts (*.sh) have UNIX/POSIX line endings. Reduce some time values so that the tests run faster. Change-Id: I81df7c6f72d7d807d1856863cbea1bb6326ca711 Reviewed-on: https://code.wireshark.org/review/4407 Tested-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01Qt: Try to reduce the initialization time.Gerald Combs1-1/+1
Change-Id: I4f7e9abee9ebb7ecc862e2122bc47ec65252c3ec Reviewed-on: https://code.wireshark.org/review/4410 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01Qt: Try to fix a Visual C++ encoding warning.Gerald Combs2-7/+10
Try to fix .\simple_dialog.cpp(49) : warning C4566: character represented by universal-character-name '\uFFFF' cannot be represented in the current code page (1252) We're assigning a delimiter. "Cannot be represented" is a feature, not a bug. Change-Id: Iba8bc5f5b42a43ec971d822b0e00f932787c7b16 Reviewed-on: https://code.wireshark.org/review/4409 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01GSM SMS: follow-up of gd65b7d5Pascal Quantin1-55/+54
Change-Id: I221e1411501e7c15eafe43e109f478684fa5ef10 Reviewed-on: https://code.wireshark.org/review/4408 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-01http: ignore response body for HEAD requestsPeter Wu1-2/+7
Responses to HEAD requests must not have a message body, so do not attempt to use the Content-Length and similar headers that indicate a non-empty message body in the response. Those point to the entity that would be returned for non-HEAD requests. Requests do not have request_method set, so do not limit desegmentation by HEAD in that case. Verified by comparing the output of `tshark -O http` and by looking in the Wireshark GTK UI. Bug: 6064 Change-Id: I7f027a06d8480673ca9754037d080c3b25cc5816 Reviewed-on: https://code.wireshark.org/review/4357 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-01Update the release notes.Gerald Combs1-29/+4
Change-Id: I2a5b2d45be806cd873a62062924966d82ce4c296 Reviewed-on: https://code.wireshark.org/review/4406 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01Eliminate proto_tree_add_text from GSM_SMS dissector.Michael Mann3-1494/+1174
Change-Id: Ibe189239735da2ebb1b0ce61a5af249975b38be3 Reviewed-on: https://code.wireshark.org/review/4402 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-01cmake: update FindGTK2 to v3.0.1-1824-g0b12815Peter Wu1-146/+452
Current FindGTK2.cmake as included with Wireshark cannot do a 32-bit build even after setting CMAKE_LIBRARY_PATH=/usr/lib32. After an update to upstream FindGTK2 (v3.0.1-1824-g0b12815), things build again. Compared to upstream FindGTK2, FindWSWinLibs and related hints have been added (note that "${GTK2_HINTS}/lib" is not a typo, it is needed as some headers are includes in locations like lib/gtk-2.0/include/). The include paths have become relative again as there are no files like FindPackageHandleStandardArgs in the Wireshark source tree. Diff between upstream FindGTK2 and the version in this patch: diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake index 72bb8eb..9b4f989 100644 --- a/cmake/modules/FindGTK2.cmake +++ b/cmake/modules/FindGTK2.cmake @@ -167,2 +167,5 @@ +include( FindWSWinLibs ) +FindWSWinLibs( "gtk2" "GTK2_HINTS" ) + #============================================================= @@ -176,4 +179,4 @@ -include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake) +include(SelectLibraryConfigurations) +include(CMakeParseArguments) @@ -289,2 +292,5 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) ${_suffixes} + HINTS + "${GTK2_HINTS}/include" + "${GTK2_HINTS}/lib" ) @@ -395,2 +401,4 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib + HINTS + "${GTK2_HINTS}/lib" ) @@ -409,2 +417,4 @@ function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version) [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib + HINTS + "${GTK2_HINTS}/lib" ) @@ -829,3 +839,3 @@ set(_GTK2_did_we_find_everything true) # This gets set to GTK2_FOUND -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(FindPackageHandleStandardArgs) Change-Id: I02103409a79ea30d1bf7cc0dfb43a9e41f8a4db3 Reviewed-on: https://code.wireshark.org/review/4293 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-01cmake: use pkg-config for resolving dependenciesPeter Wu9-25/+106
Changes: * Fix glib2 search path. * Add pkg-config support to CAP, GEOIP, GNUTLS, LUA, PortAudio (API 19), zlib, kerberos. * Add pkg-config support to libnl3, libnl2 and libnl1 (but tested only with libnl3). This makes it easier to do 32-bit builds on 64-bit hosts by just setting `PKG_CONFIG_LIBDIR`. Due to how HINTS work, it is still fragile though: missing 32-bit libraries will cause a fallback to 64-bit libraries. A future patch could check for `<PREFIX>_FOUND` and remove the manual `find_path` and `find_library` hackery since the paths are already known. Change-Id: Ieb4fb74695c96afb1a4c70168e84abb1fa4612c6 Reviewed-on: https://code.wireshark.org/review/4292 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-01Dissect ext_capab and alt_mac_addr subelements of wifi display IE.Anndy Ke1-0/+91
Support two subelements of WFD IE: - WFD Extended Capability Bitmap - Alternative MAC Address Change-Id: Ic365fdd84a6db6cf7d21c6ea32924a094432f83a Reviewed-on: https://code.wireshark.org/review/4380 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-01LLDP: TIA Network Policy Unknown Policy Flag Decode is not correctAlexis La Goutte1-18/+8
Wrong length for field... Bug:10512 Change-Id: I416a34d5f50cc0e842612a084c95d885eea68ef1 Reviewed-on: https://code.wireshark.org/review/4377 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-01idl2wrs (DCERPC): fix some warningAlexis La Goutte7-242/+254
* Fix -Wmissing-prototypes in * Fix unused variable for drusapi (using _U_) Need to fix indent and some unused function/variable to remove from DIRTY list Change-Id: Ib6f325f0b54e2eb254ec38a41199b4b60a4d90a1 Reviewed-on: https://code.wireshark.org/review/4398 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-01GIF: add a missing hf registrationPascal Quantin1-0/+2
Change-Id: Ib90054ef8a87f40249f644e8c7065b755419a11c Reviewed-on: https://code.wireshark.org/review/4396 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-09-30Add editor modelines; Adjust whitespace as needed.Bill Meier99-1755/+3044
Change-Id: I434da226c842298f4fb2a4335d06d51e164af2af Reviewed-on: https://code.wireshark.org/review/4394 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30Note why strlen(args) could be < linelen.Guy Harris1-0/+5
Change-Id: I8fb3c35be0aa80895b8a917af8a9fd2542fbd9d6 Reviewed-on: https://code.wireshark.org/review/4393 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-09-30correct the line length if it was longer than the actual string suppliedMartin Kaiser1-0/+2
by the caller Bug: 10516 Change-Id: Ib2c9ab449b95da92cc889d0992fad30f432a2836 Reviewed-on: https://code.wireshark.org/review/4386 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-30Add editor modelines; Adjust whitespace; Remove boilerplate commentsBill Meier75-2374/+3242
Change-Id: I1f5f83ed441f6009125cf2cbe5023af04986898a Reviewed-on: https://code.wireshark.org/review/4392 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30packet-fp_umts_fp.c: variousBill Meier1-129/+147
- Use #if 0/#endif to comment out code instead of /* ... */ = Add editor modelines and adjust whitespace as needed. Change-Id: I6f7e18a7955cd17d6d727090de802374a7cae0c4 Reviewed-on: https://code.wireshark.org/review/4391 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30packet-ses.[hc], packet-pres.c: various:Bill Meier4-324/+352
- Create/use extended value-strings; - Move proto-register...() to (near) the end of the file; - Add editor modelines and adjust whitespace as needed. Change-Id: I7ebe6dfd62b3fb190aa1cefc9b35d40f156f11ea Reviewed-on: https://code.wireshark.org/review/4390 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30packet-simulcrypt.c: variousBill Meier1-25/+51
- Add/use several extended value strings; - Add (what appear to be) 3 missing entries to a value-string array; - Add editor mode-lines and adjust whitespace as needed. Change-Id: Ia3bea3c52130ae07d1f0c271659fb010abecb179 Reviewed-on: https://code.wireshark.org/review/4389 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30packet-sscop.c: various:Bill Meier1-136/+151
- Add/use extended value-string; - Add editor-modelines and adjust whitespace as needed. Change-Id: I5e03d6bcaeb2f4beee37ad4778a87657ae82128d Reviewed-on: https://code.wireshark.org/review/4388 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30packet-mgcp.[hc]: Various changes:Bill Meier2-382/+409
- Add/use extended value-string; - Move proto_register...() and proto_reg_handoff...() to the end of the file; - Add editor modelines and adjust whitespace as appropriate. Change-Id: Iede67c418d9f2b4e263113bb14e77d6a56a16225 Reviewed-on: https://code.wireshark.org/review/4387 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30Add more HAVE_LIBPCAP checks.Gerald Combs2-1/+5
Change-Id: I82e62f6be03a2ae1617cd5b8e430b73ca8fbe7f8 Reviewed-on: https://code.wireshark.org/review/4385 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-30Qt: Finish implementing -gGerald Combs1-4/+8
Should fix the current dist failure. Change-Id: Ib1b8d92f6267040c9eef2e4c27ca78c6dd0631be Reviewed-on: https://code.wireshark.org/review/4384 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-30Qt: Try to fix libpcap-less builds.Gerald Combs1-1/+2
Change-Id: I64f4d6490388858306180445b58863d57217986a Reviewed-on: https://code.wireshark.org/review/4383 Reviewed-by: Gerald Combs <gerald@wireshark.org>