Gerald Combs [Sun, 16 Jul 2017 17:05:21 +0000 (17:05 +0000)]
[Automatic update for 2017-07-16]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: I01c07ea17d54e5518659abac5cd3c8c9ddfea5e6
Reviewed-on: https://code.wireshark.org/review/22647
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Dario Lombardo [Sun, 16 Jul 2017 13:42:34 +0000 (15:42 +0200)]
Qt: add initializers (CID
1162824).
Change-Id: I46f56fb99c75eebc6418fa7ac88995f49abedc91
Reviewed-on: https://code.wireshark.org/review/22645
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Dario Lombardo [Sun, 16 Jul 2017 13:27:24 +0000 (15:27 +0200)]
bthci-evt: decrement number_of_loops to avoid hang (CID
1399639).
Change-Id: Ib8af835a331582677a391c59d145530cf0590122
Reviewed-on: https://code.wireshark.org/review/22644
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Sun, 16 Jul 2017 10:32:40 +0000 (12:32 +0200)]
Qt: refactor UatTreeView into something reusable
UatTreeView had two functions:
1. Saner navigation functionality when pressing tab.
2. Start editing when the currently selected item changes.
Since this tab navigation functionality is desired in more places,
extract this functionality. Add more documentation while at it and use
an alternative, declarative style to connect signals.
Move the second functionality to the caller since not all views need it.
Change-Id: Ibe886f2c2763dbe024614203a44b72173fbbce06
Reviewed-on: https://code.wireshark.org/review/22639
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Sun, 16 Jul 2017 11:25:35 +0000 (13:25 +0200)]
ssl,dtls: make some fields in RSA keys dialog optional
The IP address has been unused since 2.0. The port/protocol fields have
become unnecessary since 2.4 with the introduction of Decode As. Do not
require the user to specify these fields if they just want to set the
RSA key file.
In a future version, these three fields will be completely removed.
Change-Id: Iefc5a8778aa1122b76b707018c00b6ec429dc107
Reviewed-on: https://code.wireshark.org/review/22640
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 Jul 2017 08:50:19 +0000 (10:50 +0200)]
.mailmap: fix duplicates and regenerate AUTHORS
Change-Id: I1332c63d59edf5b2a2ac8fe605d6f15cf6afa4ae
Reviewed-on: https://code.wireshark.org/review/22638
Reviewed-by: Yasuyuki Tanaka <yatch1.tanaka@toshiba.co.jp>
Reviewed-by: Jonathan M Munoz S <jonathan.munoz@inria.fr>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Sun, 16 Jul 2017 11:30:08 +0000 (13:30 +0200)]
Qt: show UAT description for header items
Be sure to display the extended description for UAT fields in the
tooltip for the column header like GTK+ did.
Change-Id: I294d2d3fb7f6d55df239129bea5d780b15deacc6
Reviewed-on: https://code.wireshark.org/review/22641
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Sun, 16 Jul 2017 05:42:26 +0000 (22:42 -0700)]
Ignore .moc.cpp files in ui/qt/widgets.
Change-Id: Ie709b9a13f1f2a76b355ffebeadbed0e47d90d2a
Reviewed-on: https://code.wireshark.org/review/22636
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 16 Jul 2017 03:30:33 +0000 (20:30 -0700)]
Another enterprises -> enterprises.tsv rename.
Change-Id: I59dcc7fa066d75ba14f5f7bf645a8eb24839db1c
Reviewed-on: https://code.wireshark.org/review/22635
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 16 Jul 2017 03:20:55 +0000 (20:20 -0700)]
Fix for building without libpcap and extcap.
(A further fix should be "don't put the "Capture" section into the
welcome screen if we have neither libpcap nor extcap".)
Change-Id: I83e65e6dc31040292af7fe88ccd73e485613c76f
Reviewed-on: https://code.wireshark.org/review/22634
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Peter Wu [Sat, 15 Jul 2017 17:21:29 +0000 (19:21 +0200)]
Qt: fix build without libpcap and without extcap
global_capture_opts is only defined when libpcap or extcap are enabled.
Change-Id: If692a7ac365b77d9efc52f589fef1aa906d5d14e
Fixes: v2.5.0rc0-425-ge036f4a282 ("Qt: Main Welcome behavior tweaks.")
Reviewed-on: https://code.wireshark.org/review/22629
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Fri, 14 Jul 2017 21:38:59 +0000 (14:38 -0700)]
Qt: Main Welcome behavior tweaks.
Update the recent item list and interface tree style sheets so that
hovered items have a different background color. This should make it
more obvious that they can be clicked.
Select the default interface (or failing that, the first interface) at
application startup and focus on the interface tree. This should make it
less likely that the user will start typing in a capture filter with the
wrong (or no) interface selected. Note that we should probably track
selected interfaces in the recent file instead of forcing the user to
select one via the preferences.
This should hopefully address some of the issues in bug 12636 and do so
without changing the layout (which we can do in another commit).
Change-Id: I96a417973f4270a70f41d04c40c4947a09613bdc
Ping-Bug: 12636
Reviewed-on: https://code.wireshark.org/review/22627
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Thu, 13 Jul 2017 20:03:13 +0000 (13:03 -0700)]
Rename enterprises to enterprises.tsv and ship it.
Rename "enterprises" to "enterprises.tsv" so that its format is a bit more
obvious and so that double-clicking the file might do something useful.
Add it to the Windows packages.
Change-Id: I5ef54a04ce1b4926aa4535e756e04b3e2a56d463
Reviewed-on: https://code.wireshark.org/review/22616
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Sun, 9 Jul 2017 00:15:25 +0000 (02:15 +0200)]
Qt: implement saner tab navigation for coloring rules dialog
The default QTreeView/QTreeWidget behavior for (Shift-)Tab navigation is
to select the previous/next row. For data entries with multiple columns
(such as the UAT dialog or the coloring rules dialog), column
navigation is closer to what a user would expect, so implement that.
Bug: 13856
Change-Id: Ib585030380f894e0be214a95107cb264afac7eee
Reviewed-on: https://code.wireshark.org/review/22561
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Tue, 11 Jul 2017 20:44:18 +0000 (22:44 +0200)]
Add AMT (Automatic Multicast Tunneling) RFC7450 dissector
Change-Id: Ic5e52b76e84e1d02d614b34980f94fd1288c9760
Reviewed-on: https://code.wireshark.org/review/22594
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Uli Heilmeier [Fri, 14 Jul 2017 14:27:20 +0000 (16:27 +0200)]
MP2T: Add video/mp2t media-type
Add video/mp2t media-type to dissect MP2T inside HTTP
Bug: 13888
Change-Id: I8af9727bd69ab28a21811a807a1f631bde952926
Reviewed-on: https://code.wireshark.org/review/22623
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>
Stefan Hajnoczi [Thu, 13 Jul 2017 12:54:19 +0000 (13:54 +0100)]
vsock: add missing vsockmon header reserved field
The vsockmon packet header is defined in <linux/vsockmon.h> as follows:
struct af_vsockmon_hdr {
__le64 src_cid;
__le64 dst_cid;
__le32 src_port;
__le32 dst_port;
__le16 op; /* enum af_vsockmon_op */
__le16 transport; /* enum af_vsockmon_transport */
__le16 len; /* Transport header length */
__u8 reserved[2];
};
The vsock dissector forgot to include the 2-byte reserved field. This
caused the transport header and payload that follow the vsockmon header
to contain junk data.
Change-Id: I0e7e6f1d9ad96ab339bd070c1becf43bc7e6a6b1
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-on: https://code.wireshark.org/review/22612
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
Stefan Hajnoczi [Thu, 13 Jul 2017 12:33:30 +0000 (13:33 +0100)]
vsock: add WTAP_ENCAP_VSOCK constant
A linktype was recently assigned to Linux vsock in libpcap commit
cfdded36ddcf5d01e1ed9f5d4db596b744a6cda5 ("added DLT_VSOCK for
http://qemu-project.org/Features/VirtioVsock").
The Wireshark vsock dissector can now be automatically applied when
wtap_encap matches the new WTAP_ENCAP_VSOCK constant.
This patch makes Wireshark dissect vsock packet captures without
manually specifying the dissector.
Change-Id: If252071499a61554f624c9ce0ce45a0ccfa88d7a
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-on: https://code.wireshark.org/review/22611
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
Aurelien Aptel [Tue, 23 May 2017 17:07:51 +0000 (19:07 +0200)]
SMB2: add sessionkey table in prefs for decryption
Add table in SMB2 protocol options to store Session ID => Session Key
mappings. If we find a matching session id while dissecting, use session
key from the table to derive crypto keys used for decryption.
Sample from https://wiki.wireshark.org/SampleCaptures#SMB3_encryption
can be loaded as follows:
tshark -ouat:smb2_seskey_list:
3d00009400480000,
28f2847263c83dc00621f742dd3f2e7b -r smb3-aes-128-ccm.pcap
To obtain the session id and key you can compile your kernel with
CIFS_DEBUG_KEYS enabled and all the info should be printed on the
console when cifs.ko generates keys. The patch that adds this
config option was merged recently and should appear in the
not-yet-released 4.13 kernel.
Alternatively you can read the keys from live memory on a x86_64
system by running a gdb script as root (see email [1] for usage and
source [2]).
[1]: https://lists.samba.org/archive/samba-technical/2017-May/120755.html
[2]: http://lists.samba.org/pipermail/samba-technical/attachments/
20170524/
2950140e/cifs_dump_keys.py
Change-Id: I2709bb5fb316a4a3614901efe967196c2925609a
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-on: https://code.wireshark.org/review/21711
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: Anders Broman <a.broman58@gmail.com>
Uli Heilmeier [Fri, 14 Jul 2017 05:21:08 +0000 (07:21 +0200)]
SIP: Add Status Code 607 (Unwanted)
RFC 8197 defines the new status code 607 Unwanted
Change-Id: I61299788b25f5ada460c88949bed3cabddc3908f
Reviewed-on: https://code.wireshark.org/review/22618
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Fri, 14 Jul 2017 09:07:39 +0000 (11:07 +0200)]
[print.c] g_slist_free_full requires #include <wsutil/glib-compat.h>
Change-Id: Iba3a95d67413d7f1a84436fc51dfdf13251bcece
Reviewed-on: https://code.wireshark.org/review/22620
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Thu, 13 Jul 2017 23:16:35 +0000 (16:16 -0700)]
Remove some unneeded includes.
Change-Id: I513936a74fe96211153fdf35f1832608b2cd053d
Reviewed-on: https://code.wireshark.org/review/22617
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Thu, 13 Jul 2017 11:44:41 +0000 (13:44 +0200)]
[GTPv2] Use proto_tree_add_bitmask_with_flags() for ULI Flags.
Change-Id: I7c209eef0114e4453008b8e7d7f8c238578e4433
Reviewed-on: https://code.wireshark.org/review/22606
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
Pascal Quantin [Thu, 13 Jul 2017 15:15:50 +0000 (17:15 +0200)]
GTK: add a comment better suiting GCC 7 parsing
Change-Id: Iab1eb1b86a750f3dedce6b2bd467fb3ba98243df
Reviewed-on: https://code.wireshark.org/review/22613
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
AndersBroman [Thu, 13 Jul 2017 10:41:12 +0000 (12:41 +0200)]
[GTPv2] Make dissect_gtpv2_uli() external and add more info when calling
dissectors for private extensions.
Change-Id: I5762fdff2b25bca8d29520780c55367b636a2871
Reviewed-on: https://code.wireshark.org/review/22604
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>
Pascal Quantin [Thu, 13 Jul 2017 12:55:15 +0000 (14:55 +0200)]
S1AP: upgrade dissector to v14.3.0
Change-Id: Ib28228db70a23d6f73f3c1740abc2e6542818ff9
Reviewed-on: https://code.wireshark.org/review/22609
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>
Pascal Quantin [Thu, 13 Jul 2017 11:56:56 +0000 (13:56 +0200)]
LPPa: upgrade dissector to v14.2.0
Change-Id: I534f6e480e0cd13f4592ff3ca6ecd7f769863927
Reviewed-on: https://code.wireshark.org/review/22608
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>
Pascal Quantin [Thu, 13 Jul 2017 11:28:14 +0000 (13:28 +0200)]
X2AP: upgrade dissector to v14.3.0
Change-Id: Idee26dcdfad15d9fb23e3fb8aeb8ad8afed747d5
Reviewed-on: https://code.wireshark.org/review/22607
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>
Sergey Avseyev [Thu, 13 Jul 2017 11:21:04 +0000 (14:21 +0300)]
couchbase: fix decoding last lookup spec
Change-Id: I96ae6225adee6875adad9e45c0543b9664b96e8a
Reviewed-on: https://code.wireshark.org/review/22605
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Thu, 13 Jul 2017 10:11:29 +0000 (12:11 +0200)]
M2AP: upgrade dissector to v14.0.0
Change-Id: If564a2cffead403dd3d06c1a031b8985fcde7e4b
Reviewed-on: https://code.wireshark.org/review/22603
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Robert Sauter [Tue, 11 Jul 2017 09:32:22 +0000 (11:32 +0200)]
IEEE 802.15.4: Support the MPX IE defined by IEEE 802.15.9
Still open: Reassembly and support for KMP payload dissection besides EAPOL
Bug: 13883
Change-Id: I48a1e6af5c6fb5594fb4e6a5258db0d8ebaf4a70
Reviewed-on: https://code.wireshark.org/review/22597
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Wed, 12 Jul 2017 21:34:42 +0000 (23:34 +0200)]
NAS EPS: upgrade dissector to v14.4.0
Change-Id: I8b0ae56889f6a52ba7d8c0c95a6b8e6a31557fa3
Reviewed-on: https://code.wireshark.org/review/22601
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Richard Sharpe [Tue, 11 Jul 2017 14:08:04 +0000 (07:08 -0700)]
Correct the dissection of zero-length SSIDs to show them as Wildcard SSIDs as
per 802.11 2012 8.4.2.2 SSID Element.
Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com>
Change-Id: I3ee2fc45063bc1ee6cb1244771e6c1452f6704e4
Reviewed-on: https://code.wireshark.org/review/22591
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Pascal Quantin [Wed, 12 Jul 2017 09:18:21 +0000 (11:18 +0200)]
GTK: fix compilation with GCC 7
Change-Id: Ifde706f4705af406fd4eee61a312d8eb0976d972
Reviewed-on: https://code.wireshark.org/review/22598
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Roland Knall [Wed, 5 Jul 2017 14:56:45 +0000 (16:56 +0200)]
Qt: Move all utility widgets to widgets subdirectory
Move all utility widgets to the widgets subdirectory and
add separate source_group for their files
Correct some alphabetization in ui/qt/CMakeLists.txt noticed
during compare.
Change-Id: I2d664edc2b32f126438fb673ea53a5ae94cd43d1
Reviewed-on: https://code.wireshark.org/review/22531
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Erik de Jong [Tue, 11 Jul 2017 19:07:52 +0000 (21:07 +0200)]
IndigoCare iCall: Support for padded packets
Fix to dissect packets from certain implementations of this protocol which have
null padding at the end of otherwise valid packets.
Change-Id: Ic7790d9bbcf9467a9de0aa738e65a597802ce494
Reviewed-on: https://code.wireshark.org/review/22593
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Tue, 11 Jul 2017 15:32:01 +0000 (11:32 -0400)]
Organize Qt source files for Visual Studio
Organize source into 5 categories:
moc Source Files - moc_* files
ui Header Files - Header files generated by .ui files
ui Files - .ui files
qrc Files - graphics? files
Header Files - Header files for Qt source headers
Change-Id: If32b8331592a2c685131ea9592893b7add1124ec
Reviewed-on: https://code.wireshark.org/review/22592
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Tue, 11 Jul 2017 13:11:01 +0000 (15:11 +0200)]
QUIC: rename to G(oogle)QUIC
quic => gquic
Change-Id: Ica9ae8cc77e09056507c9c4c5c798b613eb56194
Reviewed-on: https://code.wireshark.org/review/22589
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Tue, 11 Jul 2017 11:53:40 +0000 (13:53 +0200)]
QUIC: like Fbzero dissector check direclty offset_end
and don't subtract tag_len
Change-Id: I4dbae23614ecad0dc30e9c8581acdbf5b38b037f
Reviewed-on: https://code.wireshark.org/review/22588
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Tue, 11 Jul 2017 11:23:00 +0000 (13:23 +0200)]
QUIC: move get length packet number to function
Change-Id: I272866b04aa7833812df9d4baae2f4fe9f47b6e9
Reviewed-on: https://code.wireshark.org/review/22587
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Tue, 11 Jul 2017 11:33:26 +0000 (13:33 +0200)]
QUIC: directly return len
Change-Id: I61fed177c85081e7067ce5245349ef673c31f6e1
Reviewed-on: https://code.wireshark.org/review/22586
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Tue, 11 Jul 2017 13:39:56 +0000 (13:39 +0000)]
Zbee ZCL se: fix typo found by conflict hf
'zbee_zcl_se.met.publish_snapshot.payload_type' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT8
Change-Id: I97bc7cb467508192a3597836b721778341bc756c
Reviewed-on: https://code.wireshark.org/review/22590
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Tue, 11 Jul 2017 12:26:52 +0000 (14:26 +0200)]
[x509af] Make CertificateSerialNumber an unsigned integer to handle a 9
byte 64 bit BER encoded unsigned number.
Change-Id: I43e4a7f3103fac458a528022e0fdf6f0947804dc
Reviewed-on: https://code.wireshark.org/review/22585
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>
Robert Sauter [Tue, 11 Jul 2017 09:37:08 +0000 (11:37 +0200)]
Ethertype: Add 6LoWPAN Ethertype; register dissector
Change-Id: I3ba09b8ebc696b83531b998fcc3a0f521d86df41
Reviewed-on: https://code.wireshark.org/review/22581
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Piotr Tulpan [Tue, 4 Jul 2017 09:40:56 +0000 (11:40 +0200)]
packet-rsl.c: Adds dissection of Physical Context field.
Added as option with the default value set to TRUE. Dissection is based on
file generated from Tektronix Monitoring Solution for Mobile Networks.
Change-Id: Iedb2e742d1d406bc68e41334cac4a15da443cf3f
Reviewed-on: https://code.wireshark.org/review/22507
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Heusse [Tue, 4 Jul 2017 13:31:24 +0000 (15:31 +0200)]
GSMTAP: add LTE RRC message support
This code is borrowed from a patch proposed by altaf329@gmail.com in june 2015
(Ice136a9cb950bb97a11bee4486071b6883a0cad7) and adapted to fit current wireshark code (and minus the LTE MAC frame dissector).
Change-Id: Iaa1ea8b2d7a3e618f8aa14203449f2c77b4727f5
Reviewed-on: https://code.wireshark.org/review/22515
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>
Alexis La Goutte [Tue, 11 Jul 2017 11:49:07 +0000 (11:49 +0000)]
etypes(.h): fix typo
found by Robert Sauter
Change-Id: I8099797ae52bdee512c7dff0423717a5acb2d36f
Reviewed-on: https://code.wireshark.org/review/22582
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Tue, 4 Jul 2017 13:16:01 +0000 (15:16 +0200)]
QUIC: Add new error code (98) about decompression failure
Change-Id: I6a29e89eb18c737c257953f3dbe98727ad9815e9
Reviewed-on: https://code.wireshark.org/review/22556
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>
Robert Sauter [Mon, 10 Jul 2017 13:39:58 +0000 (15:39 +0200)]
IEEE 802.15.4: Revise Payload IE dissection
Isolate dissection of individual IEs to capture out-of-bound errors
and to continue with next IE on error.
More consistent display. Use dedicated HFs and ETTs.
More consistent code with fewer casts.
Add warning if IE dissection consumes less content than the
indicated length.
Change-Id: I1481145b9248eaa9f3d3ddf6c0e32d39b4a63861
Reviewed-on: https://code.wireshark.org/review/22577
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Sun, 9 Jul 2017 01:48:36 +0000 (21:48 -0400)]
Expand register_decode_as_next_proto to include prompt string.
Many dissectors don't have an identifier to pass to a dissector table.
When using Decode As they all have a "value" function that returns 0
just so something is returned.
A first step to a cleaner refactor of the functionality is to allow
dissectors to provide a "prompt" function when registering Decode As
with register_decode_as_next_proto() so that the text exposed in
the GUI can vary, but the function that returns 0 (nothing) can be
consolidated under decode as registration functionality. This casts
a wider net for register_decode_as_next_proto() use.
Change-Id: I2995b3c251dae70f5f529b672473d25c6288ed5c
Reviewed-on: https://code.wireshark.org/review/22562
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>
Michael Mann [Tue, 11 Jul 2017 02:29:03 +0000 (22:29 -0400)]
Promote Expert preference UAT to main preference tree.
"Expert" has been treated as a protocol "internally", but I
doubt users would consider it one. Since the only preference
is a UAT, just make it its own leaf off of the main preference
tree (similar to Filter Expressions UAT) and not have it buried
with all of the protocols.
Change-Id: I385314d8791440e6ced3dbd71305ee75bc373e52
Reviewed-on: https://code.wireshark.org/review/22580
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>
Pascal Quantin [Mon, 10 Jul 2017 20:03:19 +0000 (22:03 +0200)]
NBAP: fix Coverity CID
1414728
Change-Id: Ib64334f1fa8d7ff92dbfdf9bb805049f687836b7
Reviewed-on: https://code.wireshark.org/review/22579
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Darien Spencer [Mon, 10 Jul 2017 15:39:49 +0000 (18:39 +0300)]
UMTS FP: Fix access violation in PCH heuristic dissector
The dissector was accessing NULL if the first frame in the PCH stream was a control FP.
Change-Id: Icdf2fae57436fe59e16ebe0a5233675e7599f5f4
Reviewed-on: https://code.wireshark.org/review/22578
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Darien Spencer [Fri, 7 Jul 2017 14:03:23 +0000 (17:03 +0300)]
NBAP: Moved all global variables together
Hopefully if they are in one place replacing them with a non-static alternative will be easier
Change-Id: I91dd47ea51a1435cea4e68d88d6afe240153fe69
Reviewed-on: https://code.wireshark.org/review/22539
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Christoph Wurm [Sat, 8 Jul 2017 04:13:43 +0000 (04:13 +0000)]
Fix missing geninfo in PDML export.
Change-Id: I02b6ff7f57f81f0ac6b54806a9325ebb16b40476
Reviewed-on: https://code.wireshark.org/review/22553
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>
Pascal Quantin [Sun, 9 Jul 2017 21:41:20 +0000 (23:41 +0200)]
3GPP NAS: upgrade dissector to v14.4.0
Change-Id: Iae5627a53683de0b359a95c21866513461b5d559
Reviewed-on: https://code.wireshark.org/review/22572
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 9 Jul 2017 19:52:27 +0000 (15:52 -0400)]
filter_expressions_preferences_frame -> uat_frame
There isn't anything "filter expression" specific about it and
there are a few other things that could take advantage of a
UatFrame.
Change-Id: I0d04d176caebf0c2d8043c3bf89a81668580eae8
Reviewed-on: https://code.wireshark.org/review/22570
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, 9 Jul 2017 19:51:03 +0000 (15:51 -0400)]
Filter expressions: Rename UAT field to make it more obvious what it does
"Enabling" a filter expression means putting it in the toolbar, so state
that.
Change-Id: Ifa4ef053cf741a5aa269031e6983c7989ca1e64c
Reviewed-on: https://code.wireshark.org/review/22569
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 9 Jul 2017 02:46:52 +0000 (22:46 -0400)]
Don't use uint_to_str_back when you need guint32_to_str_buf.
It will end up eventually crashing column buffers because memory
behind the address is trounced.
Change-Id: Id6b5a42effc503e4b8bf5e1deb2135241e2893f3
Reviewed-on: https://code.wireshark.org/review/22563
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Simon Graham [Tue, 4 Jul 2017 14:38:24 +0000 (10:38 -0400)]
Add support for dissecting UDT over DTLS
Includes adding per-conversation data to store whether we are over
DTLS or UDP and registering as a heuristic sub-dissector for DTLS.
Future changes will add more use of the conversation structure.
Also included is a capture of UDT over DTLS in test/captures/udt-dtls.pcapng.gz,
the associated private key for the session in test/keys/udt-dtls.key and a
new test in the decryption suite to check this works.
Change-Id: I76826d3b35768d0b58f5335063884616968e5784
Reviewed-on: https://code.wireshark.org/review/22533
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>
John Keeping [Sat, 22 Apr 2017 13:20:11 +0000 (14:20 +0100)]
ZigBee: fix ZCL configure reporting response parsing
If configure reporting succeeds for all attributes, then the response
contains only a success status byte but if any attribute fails, then
every record contains a direction byte and attribute identifier.
By handling the "all successful" case specially, add an expert info
message to indicate a problem if the message length indicates that we
have hit this special case but the status is not "success".
Change-Id: I3facae8ac07f1a249cc6ae1b2454f8381151355b
Reviewed-on: https://code.wireshark.org/review/22557
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>
Stefan Metzmacher [Mon, 19 Sep 2016 02:35:49 +0000 (04:35 +0200)]
packet-dcerpc: move auth information into a subtree
Change-Id: I0e5d3967a26b79c899b0d219317e2963969cba6b
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/17809
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
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>
Alexis La Goutte [Sun, 9 Jul 2017 13:18:33 +0000 (15:18 +0200)]
TLS13: Add draft 21 support
Release July 03, 2017
Bug: 12779
Change-Id: I527e83ccff6901688030dbcaf639878513a2ace2
Reviewed-on: https://code.wireshark.org/review/22564
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Sun, 9 Jul 2017 13:56:31 +0000 (15:56 +0200)]
TLS13: Add Ticket nonce
Add Ticket nonce added on Draft 21
Bug: 12779
Change-Id: I2891e1ffe700d85f703b29feacccdc6dd7ff376d
Reviewed-on: https://code.wireshark.org/review/22565
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 [Sun, 9 Jul 2017 14:11:48 +0000 (16:11 +0200)]
tfs: Add up down
Change-Id: Ifb7354bbbc639b4191f611c7840094f16e1f6819
Reviewed-on: https://code.wireshark.org/review/22566
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>
Stefan Metzmacher [Tue, 20 Sep 2016 00:46:24 +0000 (02:46 +0200)]
packet-dcerpc: improve the dissection of DCERPC Fault pdus
Change-Id: I70786cc561d248529167445e12190159d818ebcb
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/17811
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
Jonathan Munoz [Fri, 30 Jun 2017 14:57:07 +0000 (16:57 +0200)]
6LoWPAN: added dissection for 6LoRH. (RFC8138, RFC8025)
Change-Id: I13396077ec7f3ec4fe9cfea9b3bd03305a5ee332
Reviewed-on: https://code.wireshark.org/review/22484
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Tue, 4 Jul 2017 10:57:28 +0000 (12:57 +0200)]
QUIC: fix comment (use /* */ like other)
Change-Id: I874e2ab296d4b95146205ca30372ac1327817371
Reviewed-on: https://code.wireshark.org/review/22555
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Tue, 4 Jul 2017 10:54:52 +0000 (12:54 +0200)]
QUIC: fix indent
Change-Id: I24d2586252d1bed5a02808e9ef0ba508e6a23ad8
Reviewed-on: https://code.wireshark.org/review/22554
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Sat, 8 Jul 2017 14:33:26 +0000 (16:33 +0200)]
ieee80211: disable wireless timeline by default
As the wireless timeline is not fully finished and undocumented, disable
this GUI feature for now. This should avoid some user confusion when
opening an 802.11 trace.
For experimental and development purposes, the feature can be enabled
via the preferences (right-click on the "802.11 radio information"
layer, Protocol Preferences, Enable Wireless Timeline (experimental)").
Change-Id: Ieb529ccc0f23a051bcaba21ad18ac3c1d63b850e
Ping-Bug: 13769
Reviewed-on: https://code.wireshark.org/review/22558
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Simon Barber <simon.barber@meraki.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Alexis La Goutte [Fri, 7 Jul 2017 11:25:07 +0000 (13:25 +0200)]
BGP: fix incorrect decoding COMMUNITIES whose length is larger than 255
Issue reported by Kura
Bug: 13872
Change-Id: I054839a9e141fa4a882114b150842366c090d012
Reviewed-on: https://code.wireshark.org/review/22537
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>
Alexis La Goutte [Wed, 28 Jun 2017 19:13:01 +0000 (21:13 +0200)]
(G)QUIC: Add Heuristic to detect Google QUIC flow
Only support Q02x and Q03x version
and need to have the CHLO (Client Hello) to detect
Ping-Bug: 13529
Change-Id: I1ca7faa503aea2be4d39cb345070d901be0ebbaa
Reviewed-on: https://code.wireshark.org/review/22461
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>
Peter Wu [Sun, 2 Jul 2017 15:19:31 +0000 (17:19 +0200)]
Qt: replace zoom buttons by wheel zoom in Wireless Timeline
There are already "zoom" buttons on the main toolbar, remove the
additional, confusing wireless timeline zoom buttons.
Implement zoom functionality by the mouse wheel instead and center at
the cursor position rather than the current packet. Properly bound the
maximum zoom level too to avoid incorrect calculations.
Change-Id: Icafe84b6985138b0223abb69c975dfc94df2817a
Ping-Bug: 13769
Reviewed-on: https://code.wireshark.org/review/22496
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Mikael Kanstrup [Fri, 30 Jun 2017 10:41:08 +0000 (12:41 +0200)]
androiddump: Reduce code duplication
Some more repeated code patterns identified. Reduce code duplication
by adding some helper functions.
Change-Id: I0fecd511fd56049e9eae111cdad08252dffff6cb
Reviewed-on: https://code.wireshark.org/review/22480
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Fri, 7 Jul 2017 17:24:41 +0000 (19:24 +0200)]
Qt: Set tooltip on ByteViewTab
Set the tab name as tooltip on ByteViewTab. This is useful when
having many tabs on a small screen.
Change-Id: Idb375f0b7d510ecb9b42cfccc6ebc4dd798f463b
Reviewed-on: https://code.wireshark.org/review/22549
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Darien Spencer [Fri, 7 Jul 2017 14:40:06 +0000 (17:40 +0300)]
UMTS FP: Set missing sub-frame
HS-DSCH T2 dissection method did not set the
'subnum' field in the packet info which broke
dissection in higher layers.
Change-Id: Ib50e9d783b4abfed477479b7fbaa46d005431322
Reviewed-on: https://code.wireshark.org/review/22540
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>
Pascal Quantin [Fri, 7 Jul 2017 16:43:25 +0000 (18:43 +0200)]
GSM A GM: add APN rate control parameters elements in the right tree
Change-Id: Id0f4d84c9f0cf9c1e0ebfb45265a63e918f831e1
Reviewed-on: https://code.wireshark.org/review/22546
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Fri, 7 Jul 2017 16:36:12 +0000 (18:36 +0200)]
GSM A GM: fix dissection of AER bit
Change-Id: I705e0ed70bbd9c540615f6bf6e603596deb11d0d
Reviewed-on: https://code.wireshark.org/review/22543
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Alexis La Goutte [Fri, 7 Jul 2017 10:41:24 +0000 (12:41 +0200)]
Fbzero: fix indent
Change-Id: Iae157730303f13e8b2abe73306e88bb070c78256
Reviewed-on: https://code.wireshark.org/review/22536
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Fri, 7 Jul 2017 10:39:32 +0000 (12:39 +0200)]
Fbzero: use captured_length for avoid exception when executing the heuristic check
Change-Id: I9c51032060b821f79ba2fbbc496d6ce1e20ce304
Reviewed-on: https://code.wireshark.org/review/22535
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>
D. Ulis [Sun, 26 Mar 2017 02:56:38 +0000 (22:56 -0400)]
Ensure expert info fields have a summary.
It's not a requirement, but some dissectors didn't provide a static
summary because expert "format" was used.
While at it, fix a misleading expert info description, rename expert
info variables to ei_... and remove an unused hf entry.
Change-Id: Ib81a0d0a3950b3c90954d0053b8dae49dbb0cd51
Reviewed-on: https://code.wireshark.org/review/20567
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, 5 Jul 2017 12:15:38 +0000 (14:15 +0200)]
Qt: Add convenience function and cleanup
Add a convenience function for the displayfilter combobox
and clean up some code. On Linux, the AltModifier does not work
as it is being used by xDMs to move the window around. Setting
it to Shift.
Change-Id: I1ee9638c1cf37f40dc21f19c4e0860adc4629d4e
Reviewed-on: https://code.wireshark.org/review/22529
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Pascal Quantin [Thu, 6 Jul 2017 09:24:53 +0000 (11:24 +0200)]
NBAP: please checkAPIs.pl script
Replace (legitimate) g_warning by ws_g_warning
Change-Id: Ib8a39070b06672342ea5ea42c147c56105252f89
Reviewed-on: https://code.wireshark.org/review/22534
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 3 Jul 2017 19:50:29 +0000 (19:50 +0000)]
travis: fix build with osx (macOS)
Like say on -dev mailing https://www.wireshark.org/lists/wireshark-dev/201706/msg00113.html
and also recommanded when install Qt via homebrew (brew install qt)
[...]
If you need to have this software first in your PATH instead consider running:
echo 'export PATH="/usr/local/opt/qt/bin:$PATH"' >> ~/.bash_profile
Fix following cmake error :
- Found python module asn2wrs: /Users/travis/build/alagoutte/wireshark/tools/asn2wrs.py
CMake Error at /usr/local/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:15 (message):
The imported target "Qt5::Core" references the file
"/usr/local/.//mkspecs/macx-clang"
but this file does not exist. Possible reasons include:
* The file was deleted, renamed, or moved to another location.
* An install or uninstall procedure did not complete successfully.
* The installation package was faulty and contained
"/usr/local/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake"
but not all the files it references.
Change-Id: I47137109c6ddb30de653e424d9baef4a340faad3
Reviewed-on: https://code.wireshark.org/review/22512
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Wed, 5 Jul 2017 15:56:48 +0000 (17:56 +0200)]
xtea[.ch] (wsutil): Add Modelines info
Change-Id: I32823df7a6ad543fd7912f64169050534b6ff3a4
Reviewed-on: https://code.wireshark.org/review/22532
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Anders [Mon, 26 Jun 2017 14:42:06 +0000 (16:42 +0200)]
iface_lists: do not drop named pipes from interfaces list
(Named) pipes like "/tmp/fifo" or "-" have if_type == IF_WIRED instead
of IF_PIPE. Always try to add such interfaces such that "wireshark -i
/tmp/fifo" shows a "/tmp/fifo" item in the interfaces list.
Note that if an interface is really gone (like a disconnected USB
Ethernet device), then this could result in stale items in the list.
Ping-Bug: 13865
Fixes: v2.3.0rc0-2812-g40a5fb567a ("Restore interface selection after interface refresh")
Change-Id: Id05c65df332490a5bb789e4d6ca6404358edc3ec
Reviewed-on: https://code.wireshark.org/review/22407
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Wed, 5 Jul 2017 08:05:04 +0000 (10:05 +0200)]
UMTS RLC: check rlc_channel_assign return value when searching duplicates
Bug: 13871
Change-Id: Id28d73115b557af96c23154a18dcee502b4305ed
Reviewed-on: https://code.wireshark.org/review/22520
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Wed, 5 Jul 2017 08:19:08 +0000 (10:19 +0200)]
UMTS FP: do not try to compute CRC on payload when no payload is present
A call to tvb_memdup() with a 0 length triggers a UBSan warning
Change-Id: I6c99ef85050cd2219d2135f64f747961a8be6927
Ping-Bug: 13871
Reviewed-on: https://code.wireshark.org/review/22521
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>
Pascal Quantin [Tue, 4 Jul 2017 20:02:14 +0000 (22:02 +0200)]
RLC LTE: fix dissection of NB-IoT PDUs
While we are at it, let's cache the dissector handles
Change-Id: Ied301f0e9dc42da38976ba606df008b1e7e45102
Reviewed-on: https://code.wireshark.org/review/22518
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>
Pascal Quantin [Tue, 4 Jul 2017 18:54:08 +0000 (20:54 +0200)]
LTE RRC: upgrade dissector to v13.6.1
Change-Id: Ie436c03f5f1b471a4e814e8789eac892fcf7d444
Reviewed-on: https://code.wireshark.org/review/22517
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>
Alexis La Goutte [Thu, 8 Jun 2017 09:53:56 +0000 (09:53 +0000)]
.mailmap: update (of June)
Change-Id: Ibd558c7030cb39e7978a05b5ba633303ed0ea046
Reviewed-on: https://code.wireshark.org/review/22033
Reviewed-by: Jeroen Sack <jsack@lely.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Piotr Tulpan [Tue, 20 Jun 2017 17:32:36 +0000 (19:32 +0200)]
NBAP: improve conversation management
Keeps the address of the newly opened channels in the CTCH-SetupRqst message
to match them with the addresses sent in the Respone message to get exatch
match of the conversation.
Change-Id: I445e08480ddd178f65979b9fbc91c6031e206a61
Reviewed-on: https://code.wireshark.org/review/22271
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>
Roland Knall [Tue, 4 Jul 2017 08:22:34 +0000 (10:22 +0200)]
CMake: Fix eclipse indexer
The indexer for eclipse gets confused, because CMake automatically
adds __cplusplus=199711L which will lead to C-only files being parsed
wrong, if a __cplusplus guard is being used.
This has not interference with the code generation, just the __cplusplus
definition is omitted
Change-Id: I82aa770837668fbfbb5ac8227da1943e20b409fe
Reviewed-on: https://code.wireshark.org/review/22506
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Roland Knall [Tue, 4 Jul 2017 11:06:09 +0000 (13:06 +0200)]
UI: Fix preference utils store helper
Fix https://code.wireshark.org/review/19578 changed the behaviour when
saving a preference variable, effectively removing the capability
to store the value.
Change-Id: I6ad6b27e1779b73b58e8a76b37c9b613ff178d30
Reviewed-on: https://code.wireshark.org/review/22508
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Simon Graham [Thu, 21 Jul 2016 02:25:15 +0000 (22:25 -0400)]
Updates to UDT dissector formatting.
Includes
. Better/consistent formatting of summary in COL_INFO and details
. Fixes to properly identify protocol messages
. Decoding NAK message in summary
Change-Id: I082b83c6e0e970b2b27c84c7990abae67c658cdf
Reviewed-on: https://code.wireshark.org/review/22495
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Wu [Fri, 30 Jun 2017 21:06:39 +0000 (23:06 +0200)]
Qt: try harder to sort packet list columns as number
Properly sort columns by their numeric value even if they have a unit
string suffix or if there are multiple occurrences. These do not
strictly parse as a number, so use a more lenient matching approach.
Bug: 13827
Change-Id: I3a777448a98c70fdc05fb847b05f20e2bc6f4486
Reviewed-on: https://code.wireshark.org/review/22489
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Mon, 3 Jul 2017 13:06:20 +0000 (15:06 +0200)]
l2cap: Show initial credits in Info column
Change-Id: I61bc005ed6f9efc31f5756452a10bbcb97a68b66
Reviewed-on: https://code.wireshark.org/review/22504
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Sun, 2 Jul 2017 20:47:42 +0000 (22:47 +0200)]
btle: Add item for the generated l2cap index
Also detect "Missing Fragment Start" packet.
Change-Id: I4ec300ae5dd9e79bd4c27f84e7235e03eeb3c89c
Reviewed-on: https://code.wireshark.org/review/22498
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Darien Spencer [Sat, 1 Jul 2017 16:51:39 +0000 (19:51 +0300)]
[UMTS RLC] Allow multiple payloads in INFO column
Currently the code sets 'writable' to false for the '-1' column (all columns?) after the first successfuly decoded RRC payload.
So only the first of all RRC payloads in a single RLC will be shown. This change allows all of them to show using fences.
Change-Id: I203f0c520d331dbb142eb5bdd8339f89c5124394
Reviewed-on: https://code.wireshark.org/review/22493
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Sun, 2 Jul 2017 13:22:08 +0000 (14:22 +0100)]
Replace and remove enterprises_lookup_format()
Change-Id: I27517bdfc4d00ee758d3795bd74e54968e70efad
Reviewed-on: https://code.wireshark.org/review/22497
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>