Guy Harris [Thu, 20 Apr 2017 20:25:21 +0000 (13:25 -0700)]
Take the error message generation out of the merge_files routines.
Have them just return the information needed for the caller to produce
an error message, and have the callers use the new cfile_ routines for
reporting errors.
This requires that the "write failure alert box" routine take the
*input* file name as an argument, so that, on a merge, if the problem is
that a record from a given input file can't be written out to the type
of output file we're generating, the input file name can be given, along
with the record number in that file.
Change-Id: If5a5e00539e7e652008a523dec92c0b359a48e71
Reviewed-on: https://code.wireshark.org/review/21257
Reviewed-by: Guy Harris <guy@alum.mit.edu>
sswsdev [Fri, 14 Apr 2017 10:41:37 +0000 (13:41 +0300)]
UMTS Iub: Added U-RNTI resolving logic for UEs on DCH
The goal is to figure out the U-RNTI for UEs in DCH to
preserve a single continous RLC session when the UE moves to FACH
(Since the UE ID in FACH is derived from the identity found in the
MAC layer, which is sometimes the U-RNTI)
UMTS RRC dissector now defines a single 'umts rrc private data'
structure as the way to access the actx->private_data field
Change-Id: Id0ffcbcdf0a8babe533915855909e250852e46cf
Reviewed-on: https://code.wireshark.org/review/21087
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>
Michael Mann [Thu, 20 Apr 2017 17:05:52 +0000 (13:05 -0400)]
sigcomp: Shift operand should be limited to 16 bits
Change-Id: I5a6fbcacf874962c361e68fef7402dc775aca658
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1154
Bug: 13610
Reviewed-on: https://code.wireshark.org/review/21250
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Thu, 20 Apr 2017 18:46:45 +0000 (11:46 -0700)]
cf_open() pops up a dialog box on errors; its callers shouldn't do so.
Change-Id: I1c65854b5bde1c64d70cb17a13080829f0faa27b
Reviewed-on: https://code.wireshark.org/review/21253
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Thu, 20 Apr 2017 18:23:51 +0000 (11:23 -0700)]
Have separate routines for open-for-reading and open-for-writing errors.
Expand comments while we're at it.
Change-Id: I6dcc791eab1c9e323a9572f3d54720d223bdd64b
Reviewed-on: https://code.wireshark.org/review/21252
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Thu, 20 Apr 2017 17:14:50 +0000 (10:14 -0700)]
Make the command-line and alert-box failure messages more similar.
Change-Id: I94af221a0ce8b6b3ff8e0e1b94d5379351ac0962
Reviewed-on: https://code.wireshark.org/review/21251
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Nicolas BERTIN [Wed, 19 Apr 2017 20:37:04 +0000 (22:37 +0200)]
noe: reworked EVT_BT_KEY_... message handling
Change-Id: I36763e4f1b6bad6c7fd62100164a61a239653646
Reviewed-on: https://code.wireshark.org/review/21226
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Thu, 20 Apr 2017 16:55:35 +0000 (09:55 -0700)]
Fix a compiler warning.
(Clang FTW! Is this not an issue on x86-64 macOS, so that it doesn't
warn about it, or does it, unlike GCC, require a particular -W flag to
warn about non-volatile variables being stomped by setjmp/longjmp?)
Change-Id: I253c1ea324feac1372aa4077aaba03c787a47d9f
Reviewed-on: https://code.wireshark.org/review/21248
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Peter Wu [Wed, 12 Apr 2017 20:04:38 +0000 (22:04 +0200)]
Qt: show relative time for the IO Graph in an appropriate unit
The GTK+ UI performs automatic formatting of the units (us, ms, s) based
on the magnitude of the value (for MIN/MAX/SUM calculations). Internally
the numbers are stored as integers (microseconds).
The Qt UI did not have this formatting feature yet and would therefore
display the values as-is (in microseconds). This patch rescales the Y
value and appends an appropriate label (s, ms or us).
With multiple graphs, rescaling is disabled completely for simplicity
(GTK+ would still try to find an appropriate unit prefix if there are
multiple time graphs).
Bug: 12828
Change-Id: I26ed68fc3497e06ac283a618fee8b673b1b0cf71
Reviewed-on: https://code.wireshark.org/review/21062
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Peter Wu [Tue, 11 Apr 2017 22:55:06 +0000 (00:55 +0200)]
Qt: Prevent moving other columns on drag and drop
This workaround prevents moving around other columns during drag and
drop and also transfers the sorting order to the new position.
Bug: 13183
Ping-Bug: 13540
Change-Id: I4609c63557bf3abf06ba417ac1b40cac22a82abc
Reviewed-on: https://code.wireshark.org/review/21022
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Michael Mann [Thu, 20 Apr 2017 02:38:09 +0000 (22:38 -0400)]
packet-sigcomp.c: Fix potential negative shift
Bug: 13619
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1172
Change-Id: Ifa5ed88031425701f9cb14c80eb61311e0bba4aa
Reviewed-on: https://code.wireshark.org/review/21236
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Max Dmitrichenko [Wed, 19 Apr 2017 21:11:43 +0000 (17:11 -0400)]
memory leak: Qt code doesn't pass 'parent' argument to some Qt class constructors
found with valgrind
Change-Id: I2d73bd50a6f0e13b1817c8a518189c0e56558f72
Reviewed-on: https://code.wireshark.org/review/21227
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Michael Mann [Thu, 20 Apr 2017 02:51:45 +0000 (22:51 -0400)]
packet-xot.c: Handle potentially large representation of packet sizes
Value on wire is 2^x, so represent the field that way.
Bug: 13618
Change-Id: Ida4a85e1f52b29b8b89fa835f78ef3fff2bde5c9
Reviewed-on: https://code.wireshark.org/review/21237
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Guy Harris [Thu, 20 Apr 2017 07:22:16 +0000 (00:22 -0700)]
Fix a comment.
Change-Id: Ic99602ec405533dcf436463ee26bf312f9dd78f1
Reviewed-on: https://code.wireshark.org/review/21240
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Thu, 20 Apr 2017 07:19:01 +0000 (00:19 -0700)]
Use the new cfile_XXX_failure_message() routines more broadly.
Change-Id: I7814b3fd0353f4836ae61cbdbd4e13f659cbcb59
Reviewed-on: https://code.wireshark.org/review/21239
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Thu, 20 Apr 2017 03:25:59 +0000 (20:25 -0700)]
editcap now uses stuff from libui.
Change-Id: Ifa5cda67305682909559963ea5ce90cecc0c8e6e
Reviewed-on: https://code.wireshark.org/review/21238
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Thu, 20 Apr 2017 02:21:11 +0000 (19:21 -0700)]
Add common routines for command-line libwiretap error reporting.
These are similar to the routines added to ui/alert_box.c for dialog-box
libwiretap error reporting.
This centralizes the knowledge about what to say for various libwiretap
errors, removing some duplicate code, and giving more details in some
programs.
Change-Id: I737405c4edaa0e6c27840f78a8c587a8b3ee120b
Reviewed-on: https://code.wireshark.org/review/21234
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Max Dmitrichenko [Wed, 19 Apr 2017 21:36:48 +0000 (17:36 -0400)]
extcap: fix memory leak
found by valgrind
Change-Id: I8c5226a08be797ce72ec937138a6681d946fb13c
Reviewed-on: https://code.wireshark.org/review/20720
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Max Dmitrichenko [Wed, 19 Apr 2017 21:29:44 +0000 (17:29 -0400)]
packet-xml.c: Fix memory leaks in XML DTD processing (mostly g_* to wmem_* transition)
Change-Id: I6766e0ef3d33895ba04bca1347eabdfa854b78b1
Reviewed-on: https://code.wireshark.org/review/21229
Reviewed-by: Michael Mann <mmann78@netscape.net>
Max Dmitrichenko [Wed, 19 Apr 2017 21:32:14 +0000 (17:32 -0400)]
decode as: Fix small memory leak
Change-Id: I3b924ff3e81a5b4ca17fcb9a087b7d7520225f34
Reviewed-on: https://code.wireshark.org/review/21231
Reviewed-by: Michael Mann <mmann78@netscape.net>
Max Dmitrichenko [Wed, 19 Apr 2017 21:16:28 +0000 (17:16 -0400)]
Fix memory leak in create_persconffile_profile
found by valgrind
Change-Id: I15aef9d78dffac44e36849349dc57b4b36f23de1
Reviewed-on: https://code.wireshark.org/review/21228
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Wed, 19 Apr 2017 22:06:20 +0000 (15:06 -0700)]
Have a common "capture file write failure alert box" routine.
Take the code from save_record() to pop up an alert box and put it into
libui, with the name cfile_write_failure_alert_box().
While we're at it, clean up some variable names and comments.
Change-Id: If56e649e5afe50e7a20b39720ec96e8fe2983b24
Reviewed-on: https://code.wireshark.org/review/21233
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 19 Apr 2017 21:43:11 +0000 (14:43 -0700)]
Have a common "capture file close alert box" routine.
Take the code from cf_read() to pop up an alert box and put it into
libui, with the name cfile_read_failure_alert_box(). Use it in a couple
of places where we pop up such an error dialog.
While we're at it, get rid of the "err" argument to rescan_file();
nobody uses what it returns.
Change-Id: Iba7099b95de24309359d94eb96f606020e2ff2c3
Reviewed-on: https://code.wireshark.org/review/21232
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Wed, 19 Apr 2017 19:05:22 +0000 (21:05 +0200)]
pqsql: add salt for GSSAPI
Change-Id: Iaab55d4c727b151687b242ad02d938164521e87c
Reviewed-on: https://code.wireshark.org/review/21225
Reviewed-by: Michael Mann <mmann78@netscape.net>
Christian Ullrich [Wed, 19 Apr 2017 14:20:55 +0000 (16:20 +0200)]
pgsql: Add missing authentication types
Bug: 13622
Change-Id: I0813ebb5f506d1e702f84399416994daeb527be2
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/21222
Reviewed-by: Michael Mann <mmann78@netscape.net>
Ahmad Fatoum [Wed, 19 Apr 2017 15:40:02 +0000 (17:40 +0200)]
macosx-setup.sh: Allow downloading packages without installation
For offline installation, or for checking if all links are working
Change-Id: I0447d99b2accf6757b944a02a682b3ee7ed63846
Reviewed-on: https://code.wireshark.org/review/21223
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael Mann [Wed, 19 Apr 2017 03:02:38 +0000 (23:02 -0400)]
P_Mul: Convert GHashtable -> wmem_map to fix memleaks
Change-Id: I7bdd0a483d9744780c18b45ab9fad3de3ed238de
Ping-Bug: 13120
Reviewed-on: https://code.wireshark.org/review/21215
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Guy Davies [Tue, 18 Apr 2017 14:39:46 +0000 (16:39 +0200)]
[Diameter] Add Juniper SCG AVPs
Change-Id: I832a82b4edbfce26e3edceb0f6baed3b7a1c8b62
Reviewed-on: https://code.wireshark.org/review/21190
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Tue, 18 Apr 2017 23:20:48 +0000 (19:20 -0400)]
X11: Replace VALUEXX macros and handle endianness "natively."
Change-Id: I45d4557377a445c981e6b7cfc1dbe57f586252e5
Reviewed-on: https://code.wireshark.org/review/21210
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Roland Knall [Wed, 19 Apr 2017 10:43:31 +0000 (12:43 +0200)]
cmake: FixLibXML2 include
Add default setting for the libraries entry, to satisfy windows builds,
if no libxml2 has been found
Change-Id: I3db026b6b8446eb42c7f30ee63c00a07600948fa
Reviewed-on: https://code.wireshark.org/review/21221
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Peter Wu [Tue, 18 Apr 2017 23:40:25 +0000 (01:40 +0200)]
smb-pipe: fix memory leaks from descriptors
The values from the requests are used in a later response, so use the
packet capture file scope instead.
Bug: 13615
Change-Id: I480d9dbdc20c64eabea092065245d8687b7fc39f
Reviewed-on: https://code.wireshark.org/review/21211
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Ahmad Fatoum [Tue, 4 Apr 2017 21:23:59 +0000 (23:23 +0200)]
Add libxml2 as optional dependency
This can be used by dissectors that need to parse out-of-band
configuration.
Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783
Reviewed-on: https://code.wireshark.org/review/20912
Reviewed-by: Roland Knall <rknall@gmail.com>
Xiaochuan Sun [Mon, 17 Apr 2017 11:39:15 +0000 (19:39 +0800)]
remove unnecessary guint64 cast in IO graph
Change-Id: I35d666a5a9fb5813706c312334f1552703c9475c
Reviewed-on: https://code.wireshark.org/review/21214
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Jaap Keuter [Tue, 18 Apr 2017 21:24:23 +0000 (23:24 +0200)]
RTCP: Handle large TMMBR value presentation
TMMBR can be _very_ large (131072*2^63, larger than 64 bit entities can
hold). Therefore don't try to calculate and present the bitrate as an
integer value, but as an expression.
Bug: 13611
Change-Id: Ieb8caae5d72d06f82c134eda63f99575218584c2
Reviewed-on: https://code.wireshark.org/review/21207
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Jaap Keuter [Tue, 18 Apr 2017 21:42:33 +0000 (23:42 +0200)]
EAPOL-MKA: differentiate between actor and peers
Actor member identifier and message numbers are something else than peer
member identifiers and message numbers. Give them their own header
field.
Change-Id: I9ee0073447f861084e81ab2e23cf587005184686
Reviewed-on: https://code.wireshark.org/review/21208
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Kenneth Soerensen [Sun, 26 Mar 2017 09:56:36 +0000 (11:56 +0200)]
ZigBee: Use value_string_ext and VALUE_STRING macros
Change-Id: I04d8e1f89e0d6cf34f94ba1b6e0249297834c078
Reviewed-on: https://code.wireshark.org/review/21141
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Tue, 18 Apr 2017 19:55:26 +0000 (15:55 -0400)]
X11: Replace UNUSED macro
Change-Id: Ieed2c672fd2acb76dba0ef1c3182eb9f00a04253
Reviewed-on: https://code.wireshark.org/review/21205
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Tue, 18 Apr 2017 22:27:28 +0000 (15:27 -0700)]
Rename BASE_VALS_NO_UNKNOWN to BASE_SPECIAL_VALS.
It makes it a bit clearer what its purpose is - to allow a value_string
to be used for numeric rather than enumerated fields, giving certain
values of the field a special meaning.
Change the explanation in the documentation to match as well.
Change-Id: Id07b22eee996b79ea5f3473928d29adcabe09bf3
Reviewed-on: https://code.wireshark.org/review/21209
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael Mann [Tue, 18 Apr 2017 14:42:35 +0000 (10:42 -0400)]
X11: Sort mesa_enum to allow for value_string_ext
Adjust the dissector generator to put mesa_enum values in
numerical order. Remove comments about where the specific
values came from as sorting them means the comments aren't
always going to be in the right place.
Change-Id: I3c6b8252017c8a3ec379be49b3df069ec488cd1c
Reviewed-on: https://code.wireshark.org/review/21198
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal Quantin [Tue, 18 Apr 2017 19:55:30 +0000 (21:55 +0200)]
mate: avoid redefining NDEBUG
When building RelWithDebInfo target with MSVC, NDEBUG is automatically defined.
Avoid redefining the macro by checking if it already exists.
Change-Id: I1720f47cce0df210c2b2dff3b20c218dc2ae7b02
Reviewed-on: https://code.wireshark.org/review/21200
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Apr 2017 21:20:25 +0000 (14:20 -0700)]
Fix a comment.
Change-Id: I3a18e3fab9fa785e828df843b1b4b899beba1f19
Reviewed-on: https://code.wireshark.org/review/21206
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Apr 2017 21:07:42 +0000 (14:07 -0700)]
Fix a comment.
Change-Id: I2ed361efdaa6dcf632f054634dc473d518df4cc8
Reviewed-on: https://code.wireshark.org/review/21204
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Apr 2017 21:02:18 +0000 (14:02 -0700)]
Have a common "capture file close alert box" routine.
Take cf_close_failure_alert_box() and put it into libui, with the name
cfile_close_failure_alert_box(). Use it not only in file.c but also
in ui/export_pdu_ui_utils.c, ui/gtk/file_import_dlg.c, and
ui/qt/import_text_dialog.cpp where the error we get back isn't
necessarily an errno.
Have ui/gtk/file_import_dlg.c and ui/qt/import_text_dialog.cpp also use
cfile_open_failure_alert_box() on open errors.
Change-Id: I987f339a23ea58609390306a319923e7f92d5c07
Reviewed-on: https://code.wireshark.org/review/21203
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Peter Wu [Tue, 18 Apr 2017 14:28:52 +0000 (16:28 +0200)]
netflow: fix undefined shift
Treat any prefix length larger than 32 as 32 (effectively not masking
anything) and treat a zero-length prefix as the empty mask (matching
anything).
Change-Id: If96b03c2f76ff7624d50fefdf0b025ab373c07dc
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1152
Bug: 13607
Reviewed-on: https://code.wireshark.org/review/21189
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Tue, 18 Apr 2017 18:33:59 +0000 (14:33 -0400)]
X11: Fix missing brackets caught by GCC
packet-x11.c: In function ‘dissect_x11_request’:
packet-x11.c:3753:13: error: this ‘if’ clause does not guard...
[-Werror=misleading-indentation]
if (next_offset - *offsetp > 0)
^~
packet-x11.c:3755:17: note: ...this statement, but the latter is misleadingly
indented as if it is guarded by the ‘if’
*offsetp = next_offset;
^
cc1: all warnings being treated as errors
Makefile:4388: recipe for target 'packet-x11.lo' failed
make[6]: *** [packet-x11.lo] Error 1
Change-Id: I3605c316e7b84f7cec21ce54431f6816fccca100
Reviewed-on: https://code.wireshark.org/review/21199
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Peter Wu [Tue, 18 Apr 2017 14:01:10 +0000 (16:01 +0200)]
ositp: fix undefined behavior from large shift
Display "2^105" instead of the expanded value.
Change-Id: I455625ab66cd86587ca35d09e1eba98ae1d87a94
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1149
Bug: 13606
Reviewed-on: https://code.wireshark.org/review/21188
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Tue, 18 Apr 2017 12:57:15 +0000 (14:57 +0200)]
MPLS: Add Support for identifying Entropy Label (RFC6790)
Bug: 13605
Change-Id: I414cad63df92b17f34676364fb38815dba9020e2
Reviewed-on: https://code.wireshark.org/review/21186
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Tue, 18 Apr 2017 15:02:30 +0000 (15:02 +0000)]
RMP: fix conflicting entry in its value_string
Field 'Returncode' (rmp.retcode) has a conflicting entry in its value_string: 19 is at indices 8 (Default File Open Failed) and 10 (Bad Packet Detected))
Change-Id: I77bd9b91f0c32f484ffd2406a493426f0ad3fbf8
Reviewed-on: https://code.wireshark.org/review/21192
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Tue, 18 Apr 2017 01:52:51 +0000 (21:52 -0400)]
X11: General cleanup
1. Replace bitmask macros with proto_tree_add_bitmask + bitmask field handling
2. Replace REQUEST_LENGTH macro with actual function.
Change-Id: Ibb3b2bc8c9d0556092af0e3dc384a4aad6c07ac2
Reviewed-on: https://code.wireshark.org/review/21185
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Tue, 18 Apr 2017 03:02:57 +0000 (23:02 -0400)]
X11: GHashTable -> wmem_map
A few other cleanups related to switching to wmem_alloc()ed memory
Change-Id: I86229affaa6b89dc86ab1589471734bba9efe50d
Reviewed-on: https://code.wireshark.org/review/21184
Reviewed-by: Michael Mann <mmann78@netscape.net>
Jaap Keuter [Tue, 18 Apr 2017 07:00:01 +0000 (09:00 +0200)]
NETLINK: Show raw attribute data
Once the netlink dissector does an attribute dissector callback it knows
whether or not the callback function could handle the data. If not then
simply add the raw data to be inspected by a human.
Change-Id: Ibeb7a54f72f0f856008a50f5340e4ba142e00115
Reviewed-on: https://code.wireshark.org/review/21180
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Tue, 18 Apr 2017 08:11:06 +0000 (10:11 +0200)]
CMake: Sort entries
Put additional_toolbar in sorted position.
Change-Id: I483bca72265a5932f54ccf882c6659e94be5d95b
Reviewed-on: https://code.wireshark.org/review/21183
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Tue, 18 Apr 2017 08:03:00 +0000 (10:03 +0200)]
Qt: AdditionalToolbars is a menu
Rename actionViewAdditionalToolbars to menuAdditionalToolbars
because this is a menu, not an action.
Change-Id: I85e45c065f415ffa008792f04127d81283e54b7e
Reviewed-on: https://code.wireshark.org/review/21181
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Martin Kaiser [Mon, 17 Apr 2017 17:50:36 +0000 (19:50 +0200)]
raknet: don't THROW() an exception from a dissector
Show an expert info and return from raknet_dissect_system_address().
Change-Id: Icedab5f1956d4b4c60318a1dd4f65bc7078d4e20
Reviewed-on: https://code.wireshark.org/review/21168
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Guy Harris [Tue, 18 Apr 2017 05:58:28 +0000 (22:58 -0700)]
No need to close a descriptor that didn't get duped-to in the first place.
Addresses CID
1398217.
Change-Id: I387c4a9f1df739724b80ccaad173de2d9095b101
Reviewed-on: https://code.wireshark.org/review/21179
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Apr 2017 05:54:04 +0000 (22:54 -0700)]
Check the result of localtime().
Unlikely to fail, but it squelches CID
1398219.
Change-Id: Ibdabd2d71bdc2c09549f27f1ffe528005383ee3e
Reviewed-on: https://code.wireshark.org/review/21178
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Apr 2017 05:43:22 +0000 (22:43 -0700)]
Check the result of localtime().
Unlikely to fail, but it squelches CID
1398220.
Change-Id: I0e40146f0a32c1082e84052c6b3e382fe6a15ae7
Reviewed-on: https://code.wireshark.org/review/21177
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Apr 2017 05:31:53 +0000 (22:31 -0700)]
More checks for localtime() failing.
Addresses CIDs
1398222 and
1398221.
Fix the previous fix while we're at it.
Change-Id: I6fe54e6ad115ac05154291b76de316426db72139
Reviewed-on: https://code.wireshark.org/review/21176
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael Mann [Tue, 13 Dec 2016 12:52:38 +0000 (07:52 -0500)]
X11: Use proto_tree_add_bitmask for generated bitmasks
Change-Id: Idc95500b74452911117be8903fe0bde0c8a6fefa
Reviewed-on: https://code.wireshark.org/review/21173
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Tue, 18 Apr 2017 02:14:06 +0000 (19:14 -0700)]
Have a common "print a capture file open error message" routine.
Use that for both "open for input" and "open for output" errors.
Change-Id: Id17b732a2ca91bd080957b9fa010f781a1c65471
Reviewed-on: https://code.wireshark.org/review/21175
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Apr 2017 01:58:55 +0000 (18:58 -0700)]
Have a commont "capture file open alert box" routine.
Take cf_open_failure_alert_box() and put it into libui, with the name
cfile_open_failure_alert_box(). Use it not only in file.c but also in
ui/export_pdu_ui_utils.c, where the error we get back isn't necessarily
an errno.
Change-Id: Ia053f3e403ba464d446bd9530778d5ed302796d2
Reviewed-on: https://code.wireshark.org/review/21174
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Apr 2017 00:37:21 +0000 (17:37 -0700)]
Just say "pcap" in the short names of all pcap variants.
That's more consistent.
Handle the "libpcap" names for backwards compatibility.
Change-Id: I819404d69bddd733b7ee38e23d3ddc71110c0faf
Reviewed-on: https://code.wireshark.org/review/21172
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Apr 2017 00:17:01 +0000 (17:17 -0700)]
Eliminate an unneded member of a wtap_dumper.
The only place the time stamp precision is used is in the libpcap code,
where it determines whether to write out microsecond-precision or
nanosecond-precision time stamps; we can determine that by looking at
the type/subtype field, which is also part of that structure, so do
that.
We weren't setting it consistently - we were only setting it in libpcap
and a few other capture file writers, and not in other capture file
writers - and none of the writers other than libpcap used it.
Change-Id: If53779cf4823ca936b8bf3e8a7dbcfea5850e652
Reviewed-on: https://code.wireshark.org/review/21171
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Tue, 18 Apr 2017 00:09:26 +0000 (17:09 -0700)]
Don't close a wtap that you don't have open in the first place.
Change-Id: I4d9d539957d06cb3568df287eb36ecc34677373f
Reviewed-on: https://code.wireshark.org/review/21170
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Martin Kaiser [Thu, 6 Apr 2017 19:50:53 +0000 (21:50 +0200)]
raknet: re-structure raknet_dissect_system_address()
Create the subtree first. Increment *offset as we process the fields.
Change-Id: I03b6ba9a20541593b90ac7932aab5ac88538f640
Reviewed-on: https://code.wireshark.org/review/21167
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Binh Trinh [Sun, 16 Apr 2017 18:10:02 +0000 (14:10 -0400)]
[GTPv2]: Add preference to Decode the SRVCC Transparent Containers
This is to re-enable SRVCC Transparent Containers by letting the user make the assumption of the target technology
Change-Id: I54812716a011c6a68f48bd0c8c7d18c06c0431fd
Reviewed-on: https://code.wireshark.org/review/21147
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Kaiser [Mon, 17 Apr 2017 16:00:27 +0000 (18:00 +0200)]
Simplify dissector_try_uint_new().
Exit straight away if there's no entry for our value in the dissector
table.
Change-Id: I2637b4f03cb852dca0a6993b9f63fdc15e8edc58
Reviewed-on: https://code.wireshark.org/review/21165
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Mon, 17 Apr 2017 12:52:57 +0000 (08:52 -0400)]
packet-nsh.c: Create dissector table for next protocol
Change-Id: Id8be2a37f99f4ac9d531a694273c7d5d3f843cc1
Reviewed-on: https://code.wireshark.org/review/21163
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Guy Harris [Mon, 17 Apr 2017 18:02:49 +0000 (11:02 -0700)]
Don't assume gmtime() or localtime() succeed.
The chances that they won't, in this case, are slim to none, as the time
is after the Epoch, but this squelches CID
1398223.
We'll change the master branch to require an err_info string for
WTAP_ERR_INTERNAL and to display it in a future commit.
Change-Id: Ifb51076b25117efc53ba3ad8b434e36c71f7600f
Reviewed-on: https://code.wireshark.org/review/21169
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Martin Kaiser [Mon, 17 Apr 2017 15:55:09 +0000 (17:55 +0200)]
Fix the description of dissector_try_uint_new().
We return the number of bytes consumed by the dissector.
Change-Id: Icc22c9e033dfb11f230fb59cfb79932bc8c80548
Reviewed-on: https://code.wireshark.org/review/21164
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Jakub Zawadzki [Mon, 17 Apr 2017 16:08:27 +0000 (18:08 +0200)]
oss-fuzzshark: disable setresgid(), it fails with -EINVAL
Change-Id: I28abb1d0beb89ce45e20414298b2046f5149a25b
Reviewed-on: https://code.wireshark.org/review/21166
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Gabriel Ganne [Wed, 12 Apr 2017 11:53:19 +0000 (13:53 +0200)]
nsh: add support for nsh/nsh, and nsh/mpls
Change-Id: If7c8d703c3a019af75ef24d3813bfe64a9db2471
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
Reviewed-on: https://code.wireshark.org/review/21161
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Ahmad Fatoum [Fri, 14 Apr 2017 09:33:57 +0000 (11:33 +0200)]
Qt: Provide both file save and open preferences
This is a breaking change.
prefs_register_filename_preference hasn't been differentiating
between files to be saved and ones to be opened.
On GTK, a neutral dialog is used, so no problems there.
On Qt, a save dialog has been always used, even in dissectors that
were reading configuration files without modification.
prefs_register_filename_preference now takes an argument to indicate
whether UI could be a save dialog with a warning on overwriting
a file, or whether it's a general purpose open file dialog.
Qt now does this. Previously no warning was shown on overwriting a file,
so it may be used for opening files too without irritating the user.
This has been changed, as non-destructive reads should now use
the open dialog.
Dissectors were changed accordingly.
Change-Id: I9087fefa5ee7ca58de0775d4fe2c0fdcfa3a3018
Reviewed-on: https://code.wireshark.org/review/21086
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Guy Harris [Mon, 17 Apr 2017 07:48:20 +0000 (00:48 -0700)]
Check for localtime() failing.
It "shouldn't happen", but at least this squelches a Coverity complaint,
CID
1398224.
Change-Id: I9555f71a50574e9386a3c96d52143d838f7f121f
Reviewed-on: https://code.wireshark.org/review/21160
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Jakub Zawadzki [Sat, 8 Apr 2017 08:15:11 +0000 (10:15 +0200)]
sharkd: support for "downloading" decoded RTP stream in wave-like format.
Change-Id: Ic6b241f9b7ed302e7b11644e63230474d5933a85
Reviewed-on: https://code.wireshark.org/review/20963
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Guy Harris [Mon, 17 Apr 2017 03:47:34 +0000 (20:47 -0700)]
Clean up documentation and help messages for protocol enabling/disabling.
List all of --enable-protocol, --disable-protocol, --enable-heuristic,
and --disable-heuristic in the SYNOPSIS section of the man pages.
Undent after the list of taps for the -z option, so the following
options are at the same indentation as other options.
List --enable-protocol in the DESCRIPTION, above --disable-protocol.
Include --enable-protocol in the help message.
Change-Id: I680a54430789f3543b2d539fbded22b0b57f7f76
Reviewed-on: https://code.wireshark.org/review/21159
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 17 Apr 2017 03:02:00 +0000 (20:02 -0700)]
Get rid of unnecesary #includes.
Change-Id: I379a2a1007be1b844873d9c5e8ea53bd689f0f4d
Reviewed-on: https://code.wireshark.org/review/21158
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 17 Apr 2017 02:57:51 +0000 (19:57 -0700)]
Remove unnecessary tap.
The tap was just a trick to get fields and protocols registered as being
of interest. Now that we have mechanisms by which postdissectors can
explicitly register fields and protocols as being of interest, and are
using that, the trick is no longer needed.
Change-Id: I0bccc88a1e4ee4c9fc84b90d968820375594c5c1
Reviewed-on: https://code.wireshark.org/review/21157
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 17 Apr 2017 02:37:00 +0000 (19:37 -0700)]
Remove unnecessary tap.
The tap was just a trick to get fields and protocols registered as being
of interest. Now that we have mechanisms by which postdissectors can
explicitly register fields and protocols as being of interest, and are
using that, the trick is no longer needed.
Change-Id: Ib2620ff32c41ffa050203c1d4481c63535fb3f4b
Reviewed-on: https://code.wireshark.org/review/21156
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 17 Apr 2017 02:32:33 +0000 (19:32 -0700)]
Fix backwards test.
If fdata->flags.visited *isn't* set, this is the first pass over the
packets since opening a file or starting a redissection.
Change-Id: Ib72d122c9291ce5ac9c3a3df1b6dfb4db163698e
Reviewed-on: https://code.wireshark.org/review/21155
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Peter Wu [Tue, 4 Apr 2017 23:51:19 +0000 (01:51 +0200)]
Initial support for Linux 802.11 Netlink (nl80211) dissection
Only commands and top-level attributes are recognized, no specialization
is done (yet?) since it is a large protocol.
Fields are extracted from Linux
v4.10-rc4-749-g8585989d146c using the
"tools/generate-nl80211-fields.py --update" command.
Depends on the Generic Netlink (genl) dissector.
Change-Id: I7f81b91e3beacca8ebcb853137212406004f65e8
Ping-Bug: 13561
Reviewed-on: https://code.wireshark.org/review/20914
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Sun, 16 Apr 2017 22:54:32 +0000 (00:54 +0200)]
genl: make subdissectors responsible for header
Allow subdissectors to specify the command field for the Generic Netlink
message header, similar to how Netlink subdissectors handle the Netlink
message header (for its type field).
Pass the root tree instead of the genl tree to subdissectors (so
subdissectors can add their own layer).
Change-Id: I3e56f538661b7e8a51d2411da14d181ead820c4b
Reviewed-on: https://code.wireshark.org/review/21150
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Mon, 17 Apr 2017 01:48:30 +0000 (18:48 -0700)]
Rename some routines and structure members.
They deal with sets of hfids, which can belong to protocols as well as
fields (I guess you could argue that a protocol is a field, but...).
Change-Id: Ibd103cfa26427ead4ef54be89f1251908004cfae
Reviewed-on: https://code.wireshark.org/review/21154
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 17 Apr 2017 01:29:26 +0000 (18:29 -0700)]
Include protocols in the list of wanted hfids.
That's currently required to get the fields we want.
Bug: 12161
Change-Id: Ic1066334358c58fa915ef886b2658902393172c7
Reviewed-on: https://code.wireshark.org/review/21153
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 17 Apr 2017 01:22:48 +0000 (18:22 -0700)]
Consistently call mate_config pointers "mc".
Some routines had "matecfg", some had "mc"; be a bit more consistent.
Change-Id: I3406488315483fb281ebc3fb8a23e9e1b2104a14
Reviewed-on: https://code.wireshark.org/review/21152
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 17 Apr 2017 01:18:11 +0000 (18:18 -0700)]
Make the current MATE config pointer static only to packet-mate.c.
Pass it as an argument to everything else, so only packet-mate.c has the
notion of there being *a* configuration, and everything else takes the
configuration as an argument.
Change-Id: Ia92c1539586d3e71580fd822cf07bd3d79a6f093
Reviewed-on: https://code.wireshark.org/review/21151
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Nicolas Bertin [Wed, 12 Apr 2017 11:02:45 +0000 (13:02 +0200)]
noe: improved EVT_LOCAL_APPLICATION message decoding (and updated code to match previous reviews)
Change-Id: I3cf3687303cc582261aa62feef6bd81576965dfd
Reviewed-on: https://code.wireshark.org/review/21038
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Sun, 16 Apr 2017 21:50:30 +0000 (14:50 -0700)]
No need for this to be a global variable.
Make it local to mate_tree(), and pass it to mate_pdu_tree().
Change-Id: I489683614b4d65aec3ddd94ce2c9077180e769ca
Reviewed-on: https://code.wireshark.org/review/21149
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 16 Apr 2017 21:36:57 +0000 (14:36 -0700)]
Work around a Lemon bug.
There's a Lemon bug where this grammar produces a parser that fails
assertions; to work around it, we disable assert() failures.
(A bug report has been sent to sqlite-users about this.)
Change-Id: I6812b20fafe318425b37755a15009b0baf2d68a2
Reviewed-on: https://code.wireshark.org/review/21148
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael Mann [Tue, 13 Dec 2016 10:56:42 +0000 (05:56 -0500)]
X11: Resolve filter differences between a "list" and its "item".
The "list" is of type FT_NONE and the "item" is not. That can
cause type conflicts.
Change-Id: If62f7113bc120e392588724a0dd65b7ab32ccde7
Reviewed-on: https://code.wireshark.org/review/21146
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Jakub Zawadzki [Sun, 16 Apr 2017 15:48:49 +0000 (17:48 +0200)]
oss-fuzzshark: search for dissector in given table.
Change-Id: Ia02b0e6a92213599307e5b382e9fd7ba6c9833a3
Reviewed-on: https://code.wireshark.org/review/21145
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Michael Mann [Sun, 16 Apr 2017 14:24:56 +0000 (10:24 -0400)]
MQ: Remove duplicate values from mq_PrmId_xvals.
Appears to be duplicates between "regular" and "64-bit" versions
of values.
Change-Id: Ib615c0d85c29e11daf5d4379c18563c58ad152f9
Reviewed-on: https://code.wireshark.org/review/21138
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 16 Apr 2017 14:22:33 +0000 (10:22 -0400)]
packet-hislip.c: Remove duplicate entries from vendorID.
This does occasionally happen to enumerated vendor ID values for protocols
(company/product line buyouts/acquisitions, etc).
Use "first value" as the vendor ID of choice.
Change-Id: I9a277bf07276809e0684bd3a9f121d4a656d87f6
Reviewed-on: https://code.wireshark.org/review/21137
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 16 Apr 2017 14:19:43 +0000 (10:19 -0400)]
Netlink: Remove duplicate from nfq_ctinfo_vals
Problem seems to stem from handling of enum (and that first value has to be 0)
Change-Id: I4c5d749cc53c73988c54f2aa08e60b7f55779348
Reviewed-on: https://code.wireshark.org/review/21136
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 16 Apr 2017 14:18:28 +0000 (10:18 -0400)]
packet-qnet6.c: Remove duplicates from qnet6_kif_msg_devctl_cmd_class_vals.
Maybe the value_string needs to be broken up into the different pieces.
Change-Id: I1c69ca486eea6d8d8d1ea33d5d0d9eb2e2832ee6
Reviewed-on: https://code.wireshark.org/review/21135
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 16 Apr 2017 14:15:27 +0000 (10:15 -0400)]
[TACACS] Fix typo with TAC_PLUS_AUTHEN_METH_KRB5
Causes duplication in value_string
Change-Id: Ifdafab2f32f69115dcbb0d1e65604a60a603563c
Reviewed-on: https://code.wireshark.org/review/21134
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 16 Apr 2017 13:13:16 +0000 (09:13 -0400)]
[DOCSIS] Fix typo in docsis_conf_code.
Flagged during value_string duplication check
Change-Id: Ia6b657b6e0d8e60cf69ea0e40199b78e96837ecc
Reviewed-on: https://code.wireshark.org/review/21133
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 16 Apr 2017 13:12:11 +0000 (09:12 -0400)]
packet-vsip.c: Remove duplicate value in EVsipConfigItem_vals
Looks like it's just a typo.
Change-Id: Ic1fe505a311b423c24f24f2060b8a84c4f577ad3
Reviewed-on: https://code.wireshark.org/review/21132
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 16 Apr 2017 13:11:03 +0000 (09:11 -0400)]
packet-v52.c: Remove duplicates from info_element_values.
ETSI EN 300 347-1 V2.2.2 does have the duplicated values
documented. Maybe the value_string needs to be broken up
into the different pieces (PSTN, Control, etc).
Change-Id: I92477d9532d334945cb9e55e75534520d51dd1d1
Reviewed-on: https://code.wireshark.org/review/21131
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 16 Apr 2017 13:07:43 +0000 (09:07 -0400)]
packet-starteam.c: Remove duplicate entries from starteam_opcode_vals.
Comments around the duplicates suggest author was unsure of their
values to begin with.
Change-Id: Idc55e2b6e721e1061d8707ede4faad39901d3085
Reviewed-on: https://code.wireshark.org/review/21130
Reviewed-by: Michael Mann <mmann78@netscape.net>