aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2018-02-20Squelch some casting-away-constness warnings.Guy Harris5-9/+17
If we're constructing the string, assign the pointer to it to a non-const pointer variable, set the stat_tap_ui cli_string member to that variable, and then use the variable to free it when we're done. Don't cast away constness if we don't have to. Change-Id: If3b24dbf1c910e1e6eceb76f2f6a7ae3898315f9 Reviewed-on: https://code.wireshark.org/review/25952 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-20Don't cast away constness.Guy Harris1-1/+1
Change-Id: I04cb49a5fe52bc6de66575228b81db1288bd1959 Reviewed-on: https://code.wireshark.org/review/25948 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-20Don't cast away constness.Guy Harris1-1/+1
Change-Id: Ib69274a8bc6092129a7754c8d21aa2e6f160e242 Reviewed-on: https://code.wireshark.org/review/25942 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-20Constify an argument, remove no-longer-necessary removal of constness.Guy Harris3-3/+3
Change-Id: Ic0a70b28bfdb57c4c2ddf07cf071a85042672c9e Reviewed-on: https://code.wireshark.org/review/25941 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-20Constify some method arguments, and don't cast away constness.Guy Harris1-8/+8
Change-Id: I266a724ff672026b3fdf07ac2eb2260f37c04247 Reviewed-on: https://code.wireshark.org/review/25940 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-20Cast away constness at the point where it can't be avoided.Guy Harris1-2/+2
The only reason why we have to cast it away is that C doesn't have a good framework for creating collections of objects of arbitrary type (where type includes constness) and we're using a datatype (GHashTable) implemented and declared in C here. Do it in the g_hash_table_insert() call. Change-Id: Ibd7706255519a97b77e4e4a52fada43e050f2bf0 Reviewed-on: https://code.wireshark.org/review/25938 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-20Don't gratuitously cast away constness.Guy Harris1-1/+1
Change-Id: I235aacba37e6383d3b369ec0c9b39c9f37db5ff5 Reviewed-on: https://code.wireshark.org/review/25936 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-20Don't cast away constness.Guy Harris1-1/+1
Change-Id: I2b9534e8240e9b0daf4250575f0c17551ee920fd Reviewed-on: https://code.wireshark.org/review/25935 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-20Type casts without const lose constness.Guy Harris2-2/+2
Don't do const foo *x = (foo *)a_const_pointer; do const foo *x = (const foo *)a_const_pointer; Change-Id: Iee04f71e19fcbe8b8e9a099bad52c8f15577e3e8 Reviewed-on: https://code.wireshark.org/review/25934 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-20Qt: Right justify custom columns with multiple fieldsStig Bjørlykke1-8/+22
Default right justify custom columns with multiple fields when all fields meet the right-justify criteria. Include double, float and relative time in the right-justify criteria. Change-Id: I438eab03e3575ca551cab1a547e4f8f00e4792b2 Reviewed-on: https://code.wireshark.org/review/25919 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-20Qt: Improve sorting of custom columns with multiple fieldsStig Bjørlykke1-11/+4
Use the already parsed col_custom_fields_ids to loop all fields in custom columns. Change-Id: I937e10e087feadc788591f2e3d49568611fda69b Reviewed-on: https://code.wireshark.org/review/25918 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-19Qt: Use QFrames as separators in the filter expression toolbar.Gerald Combs2-9/+11
Use QFrames instead of QActions as separators in the filter expression toolbar. This keeps them from showing up in the overflow menu. Change-Id: I60f6f0434fe5ba88fe1b4221e9e70640eed840bb Reviewed-on: https://code.wireshark.org/review/25860 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-19Get rid of more new_ prefixes for statistics functions and types.Guy Harris5-50/+50
There are no "old" versions of them that we're keeping around. Change-Id: I3c76a14d0ec1a06df39c547da37f4dea9987df4d Reviewed-on: https://code.wireshark.org/review/25892 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-18Fix some source headers, reformat SPDX license lines in comment block.Jaap Keuter14-14/+28
Change-Id: Ibae6a64a9915003435a3fb17763535a3844143be Reviewed-on: https://code.wireshark.org/review/25891 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-18[Automatic update for 2018-02-18]Gerald Combs7-65/+223
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I5b5b729c83aa7017454b7c7d8230415e1834587f Reviewed-on: https://code.wireshark.org/review/25862 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-17Don't gratuitously cast away constness.Guy Harris1-1/+1
Change-Id: I5d953ba2f89d8c65ae62012f32757acc14108f81 Reviewed-on: https://code.wireshark.org/review/25857 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-17Qt: Another filter expression toolbar layout attempt.Gerald Combs1-5/+6
Try hiding and showing the filter expression toolbar in order to update its layout. This is a bit ham-fisted but seems to be the only way to get it to work properly after clearing and inserting buttons. Bug: 14121 Change-Id: Iea851c029c1586abfdb01c639914f6fe97ea29b3 Reviewed-on: https://code.wireshark.org/review/25840 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-02-17Qt: Replace the toolbar extension icon.Gerald Combs2-2/+18
The QToolBar extension button icon is ugly, particularly on HiDPI displays. Replace it with a RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK. Change-Id: I8822252ff5c328acd23aad345313e7cfafdffa47 Reviewed-on: https://code.wireshark.org/review/25821 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-17Qt: Add separators between filter expression buttons.Gerald Combs2-8/+24
I've noticed at SharkFest and other places that people sometimes put square brackets around their filter expression names so that it's easier to distinguish one button from another. Add separators between buttons so that this shouldn't be necessary. Change-Id: I3b1ca42f6417d2045781fc14d594faba4fd00fd5 Reviewed-on: https://code.wireshark.org/review/25820 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-17Don't have CLEAN_FILES variables for the "clean" source files.Guy Harris2-31/+23
Except for the one directory that (currently) has "not yet clean" files, epan/dissectors, we don't need a separate variable to keep track of the "clean" source files. In the cases where not all files were in CLEAN_FILES, put them into the variable used to enable -Werror or its equivalent. Change-Id: Ic4119861c1d9e381adfe31e9977e1ac71d623f5b Reviewed-on: https://code.wireshark.org/review/25830 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-17Use -Werror except for explicitly listed dirty dissectors.Guy Harris1-1/+1
Use AM_CFLAGS for everything except for libdirtydissectors in epan/dissectors. Rename GENERATED_CFLAGS/GENERATED_CXXFLAGS to DIRTY_CFLAGS/DIRTY_CXXFLAGS, as it doesn't apply to all generated files. Change-Id: I702b53e185d6972c08d68ef31c05df7b03669daa Reviewed-on: https://code.wireshark.org/review/25829 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-16Squelch redundant declaration warnings.Guy Harris3-16/+20
Have the text-to-pcap scanners define a routine that the main code calls, which both allocates and destroys the scanner. Don't declare the Lex-generated routines in a header file we create, declare that routine, instead. Change-Id: Icad6a83db1a0dea8ac390315af72383fc99f8513 Reviewed-on: https://code.wireshark.org/review/25822 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-16Use DIAG_OFF_FLEX/DIAG_ON_FLEX more consistently.Guy Harris1-0/+7
Add warning C4267 (size_t to int conversion) with MSVC to DIAG_OFF_FLEX. Addd -Wshorten-64-to-32 with Clang and GCC to DIAG_OFF_FLEX. Don't explicitly use #pragma to turn off warnings; use DIAG_OFF_FLEX for all of them. If we use DIAG_OFF_FLEX, use DIAG_ON_FLEX, even if we have no section of entirely included code at the end. Change-Id: Ibfd44e8954704e9a8bcb1bd8e54f31d28357fffb Reviewed-on: https://code.wireshark.org/review/25817 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-16Add DIAG_OFF_FLEX and DIAG_ON_FLEX for use in Flex scanners.Guy Harris1-5/+4
DIAG_OFF_FLEX turns off all warnings that we want to disable for Flex-generated code due to some versions of Flex generating code that triggers those warnings. DIAG_ON_FLEX restores those warnings, so we do the checks for code that *we* wrote. Use them in .l files. Change-Id: I613a20309a30cd4c61111a1edbe27a5d05fcbf59 Reviewed-on: https://code.wireshark.org/review/25815 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-15Suppress more PortAudio + Win64 compiler warnings.Gerald Combs1-1/+4
Add C4311 and C4312 to the suppression list. Change-Id: I90c85ee5cd3f7c3f235ed89b78d04f34bf0db449 Reviewed-on: https://code.wireshark.org/review/25810 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-14Qt: fix crash in packet dialog on changing selectionPeter Wu3-10/+35
"((capture_file_t *)cap_file_)->edt" is documented in cfile.h to cover the currently selected packet (in the packet list). But in the packet dialog, the packet selection is irrelevant and the data from a different dissection tree must be used. Change-Id: Ieaea3cf862d47540e7f6b6c84c1a2fa6945a877b Fixes: v2.5.0rc0-1532-g56a130a152 ("ByteViewText: Remove epan dependancy") Bug: 14246 Reviewed-on: https://code.wireshark.org/review/25437 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-14Convert coloring rules dialog to use model.Michael Mann10-315/+1048
Change-Id: I12a465b5451bdbaea871828329d48fda3627fca3 Reviewed-on: https://code.wireshark.org/review/25372 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-14Qt: Fix the filter expression toolbar layout.Gerald Combs1-1/+3
Take a hint from the QToolButton sources and update the filter expression toolbar using updateGeometry instead of adjustSize. This appears to do the layout updates and other changes required to draw the dropdown in the correct place. Bug: 14121 Change-Id: I45d5a1173703f9c16d89841a57f651935da43d92 Reviewed-on: https://code.wireshark.org/review/25784 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-13CMake: Install the HTML guides.Gerald Combs2-0/+3
Add a "FileInstall.cmake" module that installs files and directories. Use it to install the chunked HTML guides. Install the guides into CMAKE_INSTALL_FULL_DOCDIR. By default this is /usr/local/share/doc/Wireshark. Define DOC_DIR to match. Add explicit file and directory permissions to the default install targets. Remove the PDF install target. Bug: 14258 Change-Id: I4712a4047a54627b7520b5bf5f191e0761d19606 Reviewed-on: https://code.wireshark.org/review/25737 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-11ModelHelperTreeItem: Rename appendChild -> prependChildMichael Mann5-27/+27
The function was actually calling QList<QVariant>.prepend underneath and some users of the class may need "append" to mean "append". prepend() is faster, but current users are sorting all lists anyway. Change-Id: I65cb02f4a2d1960cc2c49034963b191156789cc9 Reviewed-on: https://code.wireshark.org/review/25730 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-11[Automatic update for 2018-02-11]Gerald Combs7-116/+235
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I1d8d8ecda65cb10240b7897399b32fb2c173003f Reviewed-on: https://code.wireshark.org/review/25727 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-10Separately count all records and data records.Guy Harris5-92/+142
A file might contain only metadata records, which exist only to provide information needed to interpret data records; no point in showing them in record counts. Put the counts into the structure that we fill in, and rename the structure and the routine to reflect that it determines statistics other than just times. Speak of data records rather than packets; the file might be full of Sysdig event records but not have any packets in it, for example. Change-Id: I8553181dca4129736bdae2c0cbba92becc28d6ef Reviewed-on: https://code.wireshark.org/review/25722 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09Move the merge_action_e enum to the Win32 file dialog source file.Guy Harris2-6/+6
It's only used with the Windows dialog, so no need to make it public. Change-Id: I4976748d642399b57abc89bccc26f680e3938509 Reviewed-on: https://code.wireshark.org/review/25719 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09Fix indentation.Guy Harris1-1/+1
Change-Id: I7f19b35032a686dfb2f776e8ff3527366b008331 Reviewed-on: https://code.wireshark.org/review/25718 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09Put the preview-generation loop into a common routine.Guy Harris7-161/+188
Don't have all the file open dialogs have their own copies. Change-Id: Icd6f2fd44b081575e6481a134027c90046938c64 Reviewed-on: https://code.wireshark.org/review/25717 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09Do changes from Generalize wtap_pkthdr into a structure for packet andAndersBroman1-3/+3
non-packet records for file_dlg_win32.c Change-Id: I34ce10e574036b2d857675008c7109d5e38be6e7 Reviewed-on: https://code.wireshark.org/review/25710 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-02-09RLC graph: fix zooming, both in normal case and when graph direction has ↵Martin Mathieson1-4/+9
been switched Change-Id: I05e02b2821367ef1a78b9ededd462324053cf06e Reviewed-on: https://code.wireshark.org/review/25683 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-09Generalize wtap_pkthdr into a structure for packet and non-packet records.Guy Harris24-83/+90
Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo522-522/+522
The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-08Get rid of unneeded #includes.Guy Harris2-4/+0
Change-Id: Ica457e3fb2a6e2318ca1e03fb7b2569c7d8e6aba Reviewed-on: https://code.wireshark.org/review/25679 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07Squelch an rc warning.Gerald Combs1-0/+2
Don't include glib if RC_INVOKED is defined so that the Microsoft Windows Resource Compiler doesn't generate the following complaint: \path\to\glib/gatomic.h(87): warning RC4011: identifier truncated to '__GCC_HAVE_SYNC_COMPARE_AND_SWA' Change-Id: I6637aee2842de4e7041b66ff4428f617478efcb4 Reviewed-on: https://code.wireshark.org/review/25670 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-07Include as "ui/summary.h", as is done elsewhere.Guy Harris1-1/+1
Change-Id: I832c74554854bf380984cab83a53e7ffe165ad84 Reviewed-on: https://code.wireshark.org/review/25658 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07Move summary.[ch] to libui.Guy Harris12-9/+335
Change-Id: I49f1eeb4fc3a90e436da116577a7d0c5ba982eee Reviewed-on: https://code.wireshark.org/review/25657 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07Generate HTTP Referer statisticsMoshe Kaplan3-0/+15
The main benefit of this feature is that it enables users to see the succession of HTTP requests that led to a specific request. A sample PCAP is available here: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=16085 Change-Id: I7c521315b848fbce659fdc01e43f261d804a3a48 Reviewed-on: https://code.wireshark.org/review/25319 Reviewed-by: Moshe Kaplan <me@moshekaplan.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07Don't assume all packets have time stamps.Guy Harris1-31/+43
We explicitly allow the not to, and, for example, Simple Packet Blocks in pcapng files don't have time stamps. Change-Id: If1db5747c9e06faa7550162df8e04dc60b71d954 Reviewed-on: https://code.wireshark.org/review/25650 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06about_dialog (qt): Fix Dead Store (Dead assignement/Dead increment) Warning ↵Alexis La Goutte1-2/+0
found by Clang Change-Id: Ib7c673980909551d9f817d60bbe2d77ed180b661 Reviewed-on: https://code.wireshark.org/review/25599 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-06Proto tree: Update left arrow navigation behavior.Gerald Combs2-0/+13
If the user presses the left arrow when a non-expaned proto tree item is selected, jump to its parent item as described in the "Main Window Navigation" section of the User's Guide.. Change-Id: Ie7478a2c292df9a225555f5539d7ba90ab5e132d Reviewed-on: https://code.wireshark.org/review/25623 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-06Don't assume all packets have time stamps.Guy Harris1-30/+43
We explicitly allow the not to, and, for example, Simple Packet Blocks in pcapng files don't have time stamps. Change-Id: I6c8921cf092de7831d0a3d6dab8467388f4e6286 Reviewed-on: https://code.wireshark.org/review/25625 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-05Qt: Update recent status via a non-blocking connection.Gerald Combs1-4/+3
Connect our recent file status signal using a Qt::QueuedConnection instead of a Qt::BlockingQueuedConnection. As described at https://woboq.com/blog/how-qt-signals-slots-work-part3-queuedconnection.html, QueuedConnection makes a copy of the argument list while BlockingQueuedConnection passess the list directly. This fixes what appears to be a false positive reported by ThreadSanitizer. Cross-thread signals are protected by a QMutex, but qmutex_mac.cpp in the Qt5 sources uses a Mach semaphore. The ThreadSanitizer manual says it supports pthread mutexes and compiler atomic operations but doesn't mention Mach semaphores. Change-Id: Icb8a63d7d0bdfe985ab8274757043ef45ae4bcde Reviewed-on: https://code.wireshark.org/review/25576 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-04[Automatic update for 2018-02-04]Gerald Combs7-481/+513
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I66df4a62ae7fb7c986130fec01359ebb7b00d71f Reviewed-on: https://code.wireshark.org/review/25590 Reviewed-by: Gerald Combs <gerald@wireshark.org>