Peter Wu [Sat, 21 Nov 2015 12:13:39 +0000 (13:13 +0100)]
cmake: do not remove ws.css; ignore auto-generated files
Do not remove "ws.css" when doing a build in the source tree. Ignore
files that were automatically generated with cmake and the Ninja
generator (cmake -GNinja).
Change-Id: I24cae27eb8ae9664e3354ba646fd5503649349b1
Reviewed-on: https://code.wireshark.org/review/12007
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Alexis La Goutte [Sat, 21 Nov 2015 07:46:10 +0000 (08:46 +0100)]
display_filter_edit(.h): fix comma at end of enumerator list [-Wpedantic] / commas at the end of enumerator lists are a C++11 extension [-Wc++11-extensions]
Change-Id: I78a35211d15d501172d5a56f7dc4da2e81fc0a07
Reviewed-on: https://code.wireshark.org/review/12002
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>
Juanjo Martin [Fri, 6 Nov 2015 15:40:11 +0000 (16:40 +0100)]
RTPS: Added Topic Information feature. This feature shows the Topic
Name and the Type Name of the sample by consulting a hash table
that relates GUIDs and this information.
This information is very useful to any analysis performed to RTPS
data. It can be disabled using a checkbox so it doesn't impact
performance when capturing (default = disabled).
Bug: 11729
Change-Id: Ic9fa3a777dfed3cb46166b8e7c9783a12c161e7d
Reviewed-on: https://code.wireshark.org/review/11602
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>
João Valverde [Wed, 18 Nov 2015 16:31:31 +0000 (16:31 +0000)]
autotools: Fix extra-compiler-warnings for system headers
Use -isystem instead of -I for external headers with GCC/clang to squash
all the noise.
cmake already uses -isystem by default for supported platforms/compilers.
Change-Id: Ia6c9d1eb9b894fda6f48c531094d792e16fd39fc
Reviewed-on: https://code.wireshark.org/review/11947
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Sat, 21 Nov 2015 08:00:35 +0000 (09:00 +0100)]
ISO14443: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I63f0b3891030ccc001f81fde94121adad37b555b
Reviewed-on: https://code.wireshark.org/review/12004
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Peter Wu [Fri, 20 Nov 2015 11:15:36 +0000 (12:15 +0100)]
usbvideo: fix Malformed packet error for SET_CUR
The SET_CUR request does not have an extended pseudo-header, the logic
likely refers to the extra bytes in the usmon packet header. Remove it
since the function handles the payload after that header.
Tested with arkmicro_webcam.pcap (from bug 8414) and
usb-malformed-error.pcapng.gz (from bug 11736).
Bug: 11736
Change-Id: I61c71bb06c37a626260447f703a5cc4db2a6fc80
Reviewed-on: https://code.wireshark.org/review/11990
Reviewed-by: Tim Ansell <mithro@mithis.com>
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>
Dario Lombardo [Fri, 20 Nov 2015 09:49:41 +0000 (10:49 +0100)]
sshdump: add define for default capture bin
Change-Id: I52a5d12bb885f5bedffa030906d15f9d67bfe2e8
Reviewed-on: https://code.wireshark.org/review/11988
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Sat, 21 Nov 2015 03:12:09 +0000 (19:12 -0800)]
Use the "pcap/pcapng packet data" dissector to dissect packet data.
And use the value_string table for LINKTYPE_ values for the link-layer
header type.
Yes, this means that the "default link-layer header" preference is now a
LINKTYPE_ value rather than a WTAP_ENCAP_ value. Both of those were raw
numbers rather than friendly strings, but at least the most of the
LINKTYPE_ values are documented on the tcpdump.org Web site, and don't
change over time, unlike WTAP_ENCAP_ values which can change from
Wireshark release to release.
Change-Id: Ib752ba2163c6857c9681dc0e07598c96d1e7234f
Reviewed-on: https://code.wireshark.org/review/12001
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sat, 21 Nov 2015 02:52:02 +0000 (18:52 -0800)]
Have a separate dissector for pcap/pcapng-format packet data.
Put that dissector into its own file, and get handles for it from the
pcap and pcapng file dissectors. Put the value_string of pcap/pcapng
LINKTYPE_ values there, and have the pcap and pcapng file dissectors
import it.
Expand that table to include all LINKTYPE_ values in the current
libpcap.
Change-Id: I9397035efa5711e8a18a26e056d3b54494fd3148
Reviewed-on: https://code.wireshark.org/review/12000
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michal Labedzki [Thu, 19 Nov 2015 17:02:30 +0000 (18:02 +0100)]
File-format: Add ISO_14443 linktype for PCAP/PCAPNG
Assign numbers for LinkTypes on webpage
http://www.tcpdump.org/linktypes.html were changed, so update
it for file dissector for PCAP/PCAPNG.
Change-Id: Icb52c2a8f19bd056723de155700b83497d5fded4
Reviewed-on: https://code.wireshark.org/review/11983
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Michal Labedzki [Sun, 8 Nov 2015 16:35:24 +0000 (17:35 +0100)]
Bluetooth: Fix remaining lengths
ACL and L2CAP payload contain its length field.
Of course it may be broken for many reasons, so
there is need to check it and show expert info warning.
Bug: 11677
Change-Id: I1988faec9faef70c95161513049ec16ceb8fcf45
Reviewed-on: https://code.wireshark.org/review/11982
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Michal Labedzki [Sun, 1 Nov 2015 18:10:38 +0000 (19:10 +0100)]
Bluetooth: HCI vendor: Add some Broadcom commands
Add some Broadcom commands found in BlueZ.
Change-Id: I6b5c6ca2a55142550c2e901443d548a5a686bc90
Reviewed-on: https://code.wireshark.org/review/11981
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Michal Labedzki [Sat, 24 Oct 2015 11:50:38 +0000 (13:50 +0200)]
Bluetooth: EIR/AD: Add URI item support
In CSSv6 there is one new item: URI (UTF-8)
Change-Id: Iafa7b563aa96a016c7178eceef28edd3a1df5dc4
Reviewed-on: https://code.wireshark.org/review/11980
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Michal Labedzki [Sat, 24 Oct 2015 11:38:34 +0000 (13:38 +0200)]
Bluetooth: Update company IDs and Member/SDO UUIDs
Update company IDs and Member/SDO UUIDs to latest Assign Number.
Change-Id: Ia543ab1bcf43cf5283658cbe0971c8bc9877426d
Reviewed-on: https://code.wireshark.org/review/11979
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Michal Labedzki [Thu, 22 Oct 2015 17:40:54 +0000 (19:40 +0200)]
Bluetooth: GATT: Add HTTP Proxy Service attributes
Add HTTP Proxy Service attributes and UUID.
Change-Id: If0ab490f2df0930d2b80687ac4c9a1d7e4d463e4
Reviewed-on: https://code.wireshark.org/review/11978
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Michal Labedzki [Tue, 13 Oct 2015 17:52:52 +0000 (19:52 +0200)]
Bluetooth: L2CAP: Improve tracing connects and disconnects
Add Connect in frame/Disconnect in frame jump-fields or Service/PSM
is possible to know what current channel payload is.
Change-Id: I6a06baaec50c5e54a1990ec8f29cf386910acc28
Reviewed-on: https://code.wireshark.org/review/11977
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Michal Labedzki [Sun, 18 Oct 2015 13:06:30 +0000 (15:06 +0200)]
Bluetooth: Add ability to add custom UUID description
Some vendors use UUID128 as own services/attributes.
Sometimes they use UUID16 for it too. Support both cases.
Change-Id: I001692b94fcc2f86eafa81012790e9134b0f2a36
Reviewed-on: https://code.wireshark.org/review/11976
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Michal Labedzki [Sun, 18 Oct 2015 07:40:52 +0000 (09:40 +0200)]
Bluetooth: Move GATT dissectors registration to GATT handoff
Change-Id: I336f8523a0ad5cf8f9da0578c92a0c68917969b4
Reviewed-on: https://code.wireshark.org/review/11975
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Graham Bloice [Fri, 20 Nov 2015 14:59:59 +0000 (14:59 +0000)]
Minor Doc Update for Windows build
Update the docs to indicate the modified -G parameter required for
CMake when building an x64 version.
Change-Id: I9cc75ca99daf248111242c2962df313de32ca0d1
Reviewed-on: https://code.wireshark.org/review/11992
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Fri, 20 Nov 2015 11:11:52 +0000 (12:11 +0100)]
sshdump: add packets count
Change-Id: Ia430200a08ada4caaa780589a2fe4b90c797d94d
Reviewed-on: https://code.wireshark.org/review/11989
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>
Branislav Makan [Fri, 20 Nov 2015 08:35:12 +0000 (09:35 +0100)]
Rule-Failure-Code enum value 14 added.
Change-Id: If17ceba9d6e84bdb3b8d7e030fd7eccc45f9ff69
Reviewed-on: https://code.wireshark.org/review/11987
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Peter Membrey [Thu, 19 Nov 2015 06:45:39 +0000 (14:45 +0800)]
Enhance ERSPAN decoder to correctly support ERSPAN3 (current version
mangles packets)
Change-Id: I3dce1a4c5f14e2fc11c3f97e216df1f68340fba4
Reviewed-on: https://code.wireshark.org/review/11957
Petri-Dish: Anders Broman <a.broman58@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>
AdrianSimionov [Tue, 17 Nov 2015 19:32:55 +0000 (20:32 +0100)]
[docsis->ucd] Dissect TYPE and LENGTH values for burst TLVs also.
* Fixed filter for TLV Length Wrong.
Change-Id: Ic2fa2a6e1faa7bad604468fbcbc431fd38a5a113
Reviewed-on: https://code.wireshark.org/review/11922
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>
Michal Labedzki [Mon, 19 Oct 2015 12:03:43 +0000 (14:03 +0200)]
androiddump: Add Bluetooth support for Android M
In real it is a fix, because the only change is new name of
process of the same application on Android.
Change-Id: I69d1362e9f11967ec1127ff89c7b45299d291fe8
Reviewed-on: https://code.wireshark.org/review/11984
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Stig Bjørlykke [Thu, 19 Nov 2015 18:54:41 +0000 (19:54 +0100)]
Qt: Fixed column issues when changing profile.
Always initialize prefs.col_list in pre_init_prefs.
When switching to a profile without a saved 'preferences' file we
have to initialize prefs.col_list to default values to avoid reusing
settings from the profile we leave.
This was introduced in
5012cf84e6d84a448171dac64c14d9c83e3d4ae6
Emit columnsChanged() before preferencesChanged().
This because columnsChanged() rebuilds cap_file_->cinfo which is used
in preferencesChanged() to align columns (and possible other actions).
Doing this in the wrong order will give an inconsistency and a
heap-buffer-overflow if having different number of columns.
Bug: 11493
Change-Id: I5792dfc0ede11b9457b96f092af8da00453787b1
Reviewed-on: https://code.wireshark.org/review/11971
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Balint Reczey [Wed, 18 Nov 2015 15:55:07 +0000 (16:55 +0100)]
More spelling fixes found by lintian
Change-Id: Id218dec9e5a721d6c63fd34962ffe50b6ab8dd56
Reviewed-on: https://code.wireshark.org/review/11946
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Diederik de Groot <dkgroot@talon.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Thu, 19 Nov 2015 17:11:24 +0000 (18:11 +0100)]
nmake: fix char in comment
Change-Id: I463f1641fd199cc58be0f88668e40064b9fce120
Reviewed-on: https://code.wireshark.org/review/11970
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Thu, 19 Nov 2015 15:19:36 +0000 (16:19 +0100)]
Profinet: use pinfo pool to build conversation filter
Packet pool cannot be used from GUI.
Bug: 11730
Change-Id: I4f5764a38a10809373c365ecf1ea50404a15b89a
Reviewed-on: https://code.wireshark.org/review/11966
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>
Dario Lombardo [Thu, 19 Nov 2015 16:52:39 +0000 (17:52 +0100)]
osx: fix build when binary list is not fully compiled.
It can happen that the $binary_list contains apps that are not compiled
(eg. for the lack of a lib). In this case the binary can't be added to
the package. Fixed checking that the binary going to be signed is present.
Change-Id: Iefd9438de972302523ba28596e905b11513a4fea
Reviewed-on: https://code.wireshark.org/review/11968
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Dario Lombardo [Thu, 19 Nov 2015 10:30:44 +0000 (11:30 +0100)]
extcap: add sshdump.
sshdump is an extcap module that allows dumping from a remote host using an ssh connection.
It goes with the existing extcap plugin interface.
Change-Id: I8987614fdd817b8173a50130812bc643a4833bca
Reviewed-on: https://code.wireshark.org/review/11402
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>
Nick Bedbury [Thu, 19 Nov 2015 13:43:52 +0000 (08:43 -0500)]
Fixing picosecond timestamp for vrt protocol. Needs to be parsed as uint64 not double
Change-Id: I4c3cf4aa84a9208c382fa4a50ca3c2ffb1773ead
Reviewed-on: https://code.wireshark.org/review/11962
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Fri, 13 Nov 2015 17:34:02 +0000 (18:34 +0100)]
ASN1 (custom.make): fix typo
Change-Id: I9cb151cad33c850fe6bb5b1fe8591a660cd4c0d9
Reviewed-on: https://code.wireshark.org/review/11811
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Kaiser [Thu, 19 Nov 2015 10:53:54 +0000 (11:53 +0100)]
use the official DLT for ISO14443
add DLT_ISO14443 to pcap_to_wtap_map[]
define WTAP_ENCAP_ISO14443, link it to the iso14443 dissector
Change-Id: Id837197c4d66071094f9336d60db36a371424807
Reviewed-on: https://code.wireshark.org/review/11959
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>
Pascal Quantin [Thu, 19 Nov 2015 09:55:24 +0000 (10:55 +0100)]
NWP: use col_add_str to set COL_INFO
As indicated in column-utils.h, col_set_str should only be used for const strings
Bug: 11726
Change-Id: I4774aac7dfba3c0f27ed90f8a4634fa19595eacb
Reviewed-on: https://code.wireshark.org/review/11958
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>
João Valverde [Wed, 18 Nov 2015 17:28:45 +0000 (17:28 +0000)]
GResource configure.ac fixup
Use PKG_CHECK_EXISTS instead of PKG_CHECK_MODULE.
Move check to happen after GLib.
Change-Id: I29276fca12556ca69cdf521a1ca22659dec28408
Reviewed-on: https://code.wireshark.org/review/11949
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>
Birol Capa [Wed, 18 Nov 2015 12:19:47 +0000 (14:19 +0200)]
Lldp: Lldp Dissector Column Info is updated for Profinet
Current Lldp dissector column information just shows the "System Description" information.
In Profinet applications, Chassis Id and Port Id gives much more information for the application.
Therefore, Lldp Dissector Column Info is updated for frames that contains Profinet tlvs.
Change-Id: I30856d4471fd38ed07f3b9a6a25ef49b2d04f047
Reviewed-on: https://code.wireshark.org/review/11940
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AdrianSimionov [Wed, 18 Nov 2015 10:19:51 +0000 (11:19 +0100)]
[docsis-type29ucd] Changed TLV Length Bad filter to make more sense
Change-Id: Idd7dcada277a25b547b0492ca272e5fbba48361d
Reviewed-on: https://code.wireshark.org/review/11938
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>
Gerald Combs [Wed, 18 Nov 2015 17:01:00 +0000 (09:01 -0800)]
Revert: Free cf->edt before free cf->epan when redissecting.
Instead of freeing cf->edt before clearing the packet list, add an extra
check to MainWindow::setMenusForSelectedTreeRow. Semi-blind attempt at
fixing bug 11719.
This reverts commit
8c211d51ef66b64c708f7ad079e7e7e913ac9f14.
This reverts commit
da71ccbf778cca5d9c48e010597570a40fd190c0.
Bug: 11719
Change-Id: Ifd07be414ffd03a40bdfa7110395c9542bd86fc4
Reviewed-on: https://code.wireshark.org/review/11943
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Guy Harris [Wed, 18 Nov 2015 19:39:57 +0000 (11:39 -0800)]
Check for ECHILD, not for "not ECHILD".
That makes the logic a bit clearer (and puts the "unexpected other
error" case at the end, where it should be).
Put all the errno checks inside an else clause, making it clearer that
it runs only if waitpid() returned -1.
Add comments, including comments explaining why just driving on after
getting EINTR should be OK.
Change-Id: Iaa1b151393fcec8b4f5bd560ef913a224400932b
Reviewed-on: https://code.wireshark.org/review/11951
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Stephan Kappertz [Wed, 18 Nov 2015 11:13:08 +0000 (12:13 +0100)]
Error from waitpid(): Fix Code is unreachable
Change-Id: Ib93bd7d62eb16177cfdcb82148c97a64f6e497b4
Reviewed-on: https://code.wireshark.org/review/11939
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael Mann [Wed, 18 Nov 2015 13:38:23 +0000 (08:38 -0500)]
create_dissector_handle -> new_create_dissector_handle for plugins
Was able to actually convert all calls to "new style"
Change-Id: If9916a4762d410f2ad12aa5431174d7462dc7ac4
Reviewed-on: https://code.wireshark.org/review/11941
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Kaiser [Wed, 18 Nov 2015 17:34:36 +0000 (18:34 +0100)]
[iso14443] add simple components of an R-block
an S-block has no block number, fix this while at it
Change-Id: I16113fde5f78d77d7db6b7cec8d4dfa46f0187aa
Reviewed-on: https://code.wireshark.org/review/11944
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Stig Bjørlykke [Wed, 18 Nov 2015 07:48:50 +0000 (08:48 +0100)]
Qt: Don't update expert icon without a capture file.
We don't show the expert info icon when not having a capture file,
so this should not be enabled when emitting redissectPackets().
Change-Id: I6ae6124ed9f69c214a2beadbdc670b15dfe3d060
Reviewed-on: https://code.wireshark.org/review/11937
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Michael Mann [Wed, 18 Nov 2015 01:16:06 +0000 (20:16 -0500)]
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I9c7d1c092bbae896ec0c2832617891346927f2e1
Reviewed-on: https://code.wireshark.org/review/11932
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>
Stig Bjørlykke [Tue, 17 Nov 2015 23:11:28 +0000 (00:11 +0100)]
Lua: Disable Reload Lua Plugins while reading file.
Hide the menu item if built without Lua.
Change-Id: I316cddd55064da590eb4167b495a7fb00a41581f
Reviewed-on: https://code.wireshark.org/review/11931
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 [Wed, 18 Nov 2015 07:15:39 +0000 (08:15 +0100)]
epan: Check for valid cf->edt before free.
Added a check for a valid cf->edt before calling epan_dissect_free(),
as this will give an unintended assert.
This is related to
da71ccbf778cca5d9c48e010597570a40fd190c0.
Change-Id: I7f7ceb1b25cfa2400063947f674df10ed6a93e9d
Reviewed-on: https://code.wireshark.org/review/11934
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
AdrianSimionov [Mon, 16 Nov 2015 23:21:41 +0000 (00:21 +0100)]
[docsis->type29ucd] Update to DOCSIS 2.0
* Added 3 missing TLVs from Type 29 UCD.
* Added to dissector the TLV Type and TLV Length as I want
to be able to add filters on this information as an user.
* Changed some variable names as I wanted it to be unified between
the Type 2 UCD (ucd.c) and this file. There are another two types of
UCD messages (which I hope I will add) and keeping variables
similar helps a lot.
* Added the expert info.
Change-Id: I808a2e710f7348eb046e0afdaa609fa28b3a18ca
Reviewed-on: https://code.wireshark.org/review/11913
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Matt Texier [Thu, 12 Nov 2015 15:06:44 +0000 (16:06 +0100)]
BGP: Add dissection of ESI NLRI (EVPN) RFC7432
Ping-Bug: 11650
Change-Id: I1e6418afe1d02da9f30c429c0220932d74344b8d
Reviewed-on: https://code.wireshark.org/review/11775
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Sun, 1 Nov 2015 21:00:28 +0000 (21:00 +0000)]
MPTCP: Use endianness macros directly instead of creating new tvbuff
tvb_new_real_data() will leak memory.
Also fix endianness because use of GUINT64_SWAP_LE_BE() assumes
platform is little endian.
Change-Id: Ic90d568e585e08674638519c11bd5deb4358bff1
Reviewed-on: https://code.wireshark.org/review/11540
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Membrey [Tue, 10 Nov 2015 11:27:10 +0000 (19:27 +0800)]
Commiting CISCO ERSPAN3 Marker dissector for pushing to upstream
Change-Id: Id0c583eacbef01d9dbdb54c27893d44cc32d9a31
Reviewed-on: https://code.wireshark.org/review/11680
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 [Mon, 16 Nov 2015 13:59:16 +0000 (14:59 +0100)]
CMakeList.txt (ui/gtk/qt) fix indent and modelines
Change-Id: I723dcd9bb99941332d1340150361a4a11803fcbb
Reviewed-on: https://code.wireshark.org/review/11871
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Peter Wu [Tue, 17 Nov 2015 17:54:41 +0000 (18:54 +0100)]
Fix crash in RTP Player on stop and close
When dragging the UI, this somehow causes a great lag. Then by
spam-clicking on the Stop button, a double free seems to occur.
Fix this by moving the audio cleanup to the outputStateChanged callback
as documented at https://doc.qt.io/qt-5/qaudiooutput.html. Note that
calling stop() in the IdleState also triggers a change event, resulting
in the desired cleanup.
Stop streams before the dialog is closed (via accept/reject). This
*cannot* be done in the destrutor of RtpPlayerDialog because destructing
QAudioOutput processes events from the event queue, resulting in
preature destruction of other objects... crash.
Change-Id: I6bfb33c9396e9bc1ffd346519d22390a97b6bdaf
Reviewed-on: https://code.wireshark.org/review/11894
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Tue, 17 Nov 2015 20:33:47 +0000 (12:33 -0800)]
CMake: Add Qt5Svg to PACKAGELIST.
...otherwise we won't copy it to ${CMAKE_BINARY_DIR}/run/Wireshark.app on
OS X, which means our flag icons won't be displayed.
Bug: 11697
Change-Id: I26cd6a2dd13be35f9a80fd93adc8248848df5978
Reviewed-on: https://code.wireshark.org/review/11923
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Guy Harris [Tue, 17 Nov 2015 22:34:45 +0000 (14:34 -0800)]
Cleanups.
Change-Id: I3c92214afa876d830733474da88e0b7e3cda237a
Reviewed-on: https://code.wireshark.org/review/11927
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Tue, 17 Nov 2015 19:47:56 +0000 (11:47 -0800)]
Qt: Fixup the I/O Graph color menu width on Windows.
Change-Id: I2032709fe62810a292121e8624a4b51f40070c36
Reviewed-on: https://code.wireshark.org/review/11921
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Stig Bjørlykke [Tue, 17 Nov 2015 21:36:01 +0000 (22:36 +0100)]
Lua: Do not deregister Listener in __gc.
Listeners should not be deregistered in __gc because they will go out
of scope while in use. Instead free allocated data when deregistering
the Listener (Listener.remove() and Reload Lua Plugins).
Bug: 11722
Change-Id: Iadf6506757df06e476ac3cac38c05f1d1d497dc4
Reviewed-on: https://code.wireshark.org/review/11924
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Balint Reczey [Mon, 16 Nov 2015 05:32:53 +0000 (09:32 +0400)]
debian: Don't ship unused duplicated images for guides
Change-Id: I815e4600de2e0c075eabec79e27a4a36e8e4e09e
Reviewed-on: https://code.wireshark.org/review/11861
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: Balint Reczey <balint@balintreczey.hu>
Martin Kaiser [Tue, 17 Nov 2015 17:48:45 +0000 (18:48 +0100)]
[iso14443] start dissecting the PCB of an S-block
S-blocks have a block number exactly like I-blocks,
give the hf variable a more generic name
Change-Id: I25774496f88bd27b1978662e4a781ddeb5e44b45
Reviewed-on: https://code.wireshark.org/review/11920
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Gerald Combs [Tue, 17 Nov 2015 01:13:23 +0000 (17:13 -0800)]
Qt: Fix some flow graph issues.
Make fillDiagram() a slot and call it after the dialog is visible.
Use the activated() signals instead of currentIndexChanged() for our
comboboxes. The former is only emitted as a result of user interaction
and the latter is always emitted when the value changed. This was a
problem for flowComboBox since initializing its value resulted an extra
call to fillDiagram().
Add a progress frame.
Change-Id: I17bcf5c990363ee758be9e3a0604dde34fc34f2d
Ping-Bug: 11710
Reviewed-on: https://code.wireshark.org/review/11897
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Martin Kaiser [Tue, 17 Nov 2015 17:38:51 +0000 (18:38 +0100)]
[iso14443] do a more precise check for uid-related commands
make sure that we don't treat an S-block as a uid command
Change-Id: Ibe001cd346eff462040df5259c7a88fa7f94bf78
Reviewed-on: https://code.wireshark.org/review/11918
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Martin Kaiser [Tue, 17 Nov 2015 16:13:32 +0000 (17:13 +0100)]
[iso14443] dissect I-block PCB components
Change-Id: I076ce2f4f7dca455a8ee12445fcbf17a9f120f49
Reviewed-on: https://code.wireshark.org/review/11917
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
AndersBroman [Tue, 17 Nov 2015 17:25:45 +0000 (18:25 +0100)]
[Diameter] Add Diameter Overload Indication AVPs [RFC 7683]
Change-Id: I003e5a9f770f14d6e18cc8df970d35a7ed4f03bb
Reviewed-on: https://code.wireshark.org/review/11914
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Mon, 16 Nov 2015 23:15:06 +0000 (15:15 -0800)]
Qt: Fix Follow Dialog crash.
Don't set WA_DeleteOnClose. This keeps the dialog from deleting itself
when we're inside a nested event loop (i.e. when we're reassembling
(TCP) or retapping (UDP or TLS)).
Make sure our beginRetapPackets() and endRetapPackets() calls are
balanced. Move updateWidgets() calls to follow() so that we update on
the first run.
Bug: 11711
Change-Id: Id585be410a315b914b27f1a116d451c863087b00
Reviewed-on: https://code.wireshark.org/review/11892
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Martin Kaiser [Tue, 10 Nov 2015 07:53:31 +0000 (08:53 +0100)]
update the ISO1443 dissector
handle the ..._CRC_DROPPED events
use pinfo->p2p_dir to store the direction
pass a boolean 'crc_dropped' to the sub-dissectors for message types
subtree for an ISO1443 message
dissect most components of most messages
Change-Id: I2570dd4d941e5db7fa541723b70ccad6ce70ab49
Reviewed-on: https://code.wireshark.org/review/11912
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Andreas Schultz [Mon, 16 Nov 2015 13:44:51 +0000 (14:44 +0100)]
decode Hotspot 2.0 Indication in 802.11 beacons
HS20 Release 1 and Release have added some new fields. Decode them
properly.
Change-Id: Ia9bdaa3422d3f10119d42ec53ad6c9e4915578b8
Reviewed-on: https://code.wireshark.org/review/11870
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>
Pascal Quantin [Tue, 17 Nov 2015 10:32:01 +0000 (11:32 +0100)]
extcap: fix a crash introduced in g622603b
When using GTK UI, cfilter is initialized to NULL, not to an empty string.
Change-Id: Ic9f3957d4de551a929578e76d5b9c63936517299
Reviewed-on: https://code.wireshark.org/review/11910
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Gerald Combs [Tue, 17 Nov 2015 00:27:34 +0000 (16:27 -0800)]
Qt: Fix a merge crash.
Update the logic in ui/qt/main_window.cpp:mergeCaptureFile to match
ui/gtk/capture_file_dlg.c:file_merge_cmd. This ensures that we don't try
to use a stale (and freed) read filter.
Call cf_set_rfcode in both.
Bug: 11718
Change-Id: I6da65e428bff39e907f45992bac7337880c02ce9
Reviewed-on: https://code.wireshark.org/review/11895
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Dario Lombardo [Tue, 17 Nov 2015 08:21:45 +0000 (09:21 +0100)]
extcap: fix a bug in cfilter
When no filter is specified, interface_opts.cfilter is not null but an empty string.
Change-Id: I5755ab7dd840be28334768cf26999048441fcc4e
Reviewed-on: https://code.wireshark.org/review/11907
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Gerald Combs [Mon, 16 Nov 2015 19:47:36 +0000 (11:47 -0800)]
Win32: Try to fix handle leaks in capture_sync.
If CreateProcess succeeds, close our child's primary thread handle. As
the PROCESS_INFORMATION page at
https://msdn.microsoft.com/en-us/library/windows/desktop/ms684873.aspx
says,
If the function succeeds, be sure to call the CloseHandle function
to close the hProcess and hThread handles when you are finished with
them. Otherwise, when the child process exits, the system cannot
clean up the process structures for the child process because the
parent process still has open handles to the child process.
Closing the handle immediately doesn't seem to do any harm here, but
add a note that we might want to store it and close it later.
In sync_interface_stats_open, close our message and data descriptors
after calling sync_pipe_wait_for_child.
Ping-Bug: 11702
Change-Id: I56e0625fdceb66fba822c2dc83e07d40844329a7
Reviewed-on: https://code.wireshark.org/review/11882
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Mon, 16 Nov 2015 11:23:17 +0000 (12:23 +0100)]
Extcap: allow Wireshark to list extcap interfaces even when WinPcap / Npcap is not installed
Bug: 11715
Change-Id: I4a043c4a298506d51cb6bf8b97aac787113a7dfa
Reviewed-on: https://code.wireshark.org/review/11869
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guenter Ebermann <guenter.ebermann@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Mon, 16 Nov 2015 22:33:32 +0000 (14:33 -0800)]
Create C handles for pipes before running dumpcap.
If the C handles can't be created, there's no point in running dumpcap.
Catch some more possible _open_osfhandle() failures while we're at it.
Change-Id: I2b955378705fc932f8d383804e908e95a957be44
Ping-Bug: 11702
Reviewed-on: https://code.wireshark.org/review/11890
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Stig Bjørlykke [Tue, 17 Nov 2015 07:38:55 +0000 (08:38 +0100)]
Qt: Removed obsolete comments.
Change-Id: I7c0905b38a668a7a6dcaeee6ec16761c9b5c0a55
Reviewed-on: https://code.wireshark.org/review/11901
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Alexis La Goutte [Mon, 16 Nov 2015 10:05:24 +0000 (11:05 +0100)]
Qt: avoid crash when use Go Next/Previous Conversation
Only enable this menu when there is a packet
Change-Id: I750f2af6e9f565afce83a5e84394cc96b3b071f9
Reviewed-on: https://code.wireshark.org/review/11868
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Mon, 16 Nov 2015 20:33:17 +0000 (21:33 +0100)]
Qt: setMenusForSelectedPacket when capture file is closed.
Moved setMenusForSelectedPacket() to captureFileClosed() because
capture_file_.capFile() is still valid in captureFileClosing().
Menu items depending on is_ip, is_tcp, is_udp, is_sctp, is_ssl,
is_rtp and is_lte_rlc must be disabled when closing the capture
file because many of the dialogs does crash when launched without
a valid frame selected.
All dialogs should probably have a guard for this to avoid crashes,
but that may be an exercise for an enhancement to add support for the
dialogs to follow the current loaded capture file.
Change-Id: If5837a355d08df76547572a25d46ffa539070de3
Reviewed-on: https://code.wireshark.org/review/11883
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>
Evan Huus [Mon, 16 Nov 2015 21:02:43 +0000 (16:02 -0500)]
Misc minor issues caught by cppcheck
All trivial (unused variables, duplicate `break`s, etc).
Change-Id: Idbfffae4f6c0b0119a90ae5849de2ed7a1180c9b
Reviewed-on: https://code.wireshark.org/review/11886
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Gerald Combs [Mon, 16 Nov 2015 20:52:49 +0000 (12:52 -0800)]
CMake: Add "C:/tools/cygwin" to FindCygwin.cmake.
Add C:\tools\cygwin to the list of search paths in FindCygwin.cmake.
This matches the behavior of config.nmake and is where Chocolatey
installs Cygwin.
Change-Id: I87a3cd64aae410b9c9abdc87c56d29aa3c4d5946
Reviewed-on: https://code.wireshark.org/review/11885
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Mon, 16 Nov 2015 23:55:01 +0000 (15:55 -0800)]
Remove old, unused images.
Change-Id: I25c3d4b7d346940c4885b3b11c26fd3415d7fca8
Reviewed-on: https://code.wireshark.org/review/11893
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Michael Mann [Sun, 15 Nov 2015 21:51:45 +0000 (16:51 -0500)]
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3
Reviewed-on: https://code.wireshark.org/review/11860
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 Rueschel [Mon, 16 Nov 2015 15:59:53 +0000 (16:59 +0100)]
Export the value_string array ip_proto_val_ext for usage in plugins
Until now, it is not possible to use the IANA-assigned protocol values in a Wireshark plugin.
This commit exports them for use on Windows machines.
As discussed on http://seclists.org/wireshark/2015/Nov/88
Change-Id: I22adc33accf5d776bd3e5cc0899d3c5b9e9d531c
Reviewed-on: https://code.wireshark.org/review/11874
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>
Peter Wu [Sat, 14 Nov 2015 11:47:28 +0000 (12:47 +0100)]
ssl,dtls: use ProtocolVersion from Server Hello
A DTLS capture from Jitsi Videobridge for Windows x64 (v519) using a
(patched?) BouncyCastle 1.51.0 exposed the odd behavior where the
ProtocolVersion from the record layer was always fixed to DTLSv1.2 while
the server agrees to use DTLSv1.0.
This resulted in a Malformed packet dissection of the ServerKeyExchange
message which mistakenly expects a SignatureAndHash field. Fix this
by using the protocol version from the ServerHello. Keep the fallback
in case a capture starts in the middle of a SSL conversation.
(Also display "DTLS" instead of "SSL" when the version is not yet
determined for DTLS packets.)
Bug: 11709
Change-Id: I0719977e3b2208da1960121b01dc109fa76bfcb6
Reviewed-on: https://code.wireshark.org/review/11821
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 [Sat, 14 Nov 2015 12:33:02 +0000 (13:33 +0100)]
ssl,dtls: use a single field to track ProtocolVersion
The SslSession struct contains a "version" field for displaying
purposes in the protocol column while the SslDecryptSession struct
has a "version_netorder" field for use in TLS hash functions (for
secrets calculations).
As these are strongly associated with each other, remove the
version_netorder field and its associated constants, let the SslSession
version field store this value instead. All SSL_VER_* are renamed to
appropriate *_VERSION macros (via search & replace), SSL_VER_UNKNOWN
is kept though.
The PCT and SSLv2 protocols had no wire value (*_VERSION), so
SSL_VER_PCT and SSL_VER_SSLv2 are assigned with some arbitrary values.
Warning: external plugins using the ssl_set_master_secret function
must now pass the wire version (TLSV1_VERSION) instead of the (now
removed) internal macros (SSL_VER_TLSv1).
Change-Id: Icd8ef15adae9c62eb21eab1c3b812166e451936f
Reviewed-on: https://code.wireshark.org/review/11820
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: Peter Wu <peter@lekensteyn.nl>
Guy Harris [Mon, 16 Nov 2015 19:49:35 +0000 (11:49 -0800)]
Catch failure of _open_osfhandle().
This may at least prevent the crash in bug 11702, by not returning
"success" with bogus file handles of -1, if the opens fail due to
leaks chewing up all the available slots. More investigation needs to
be done to see why we're leaking.
Change-Id: I89ecff4b03bca140f05c838e1e2604a03409f803
Ping-Bug: 11702
Reviewed-on: https://code.wireshark.org/review/11881
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Evan Huus [Mon, 16 Nov 2015 21:08:30 +0000 (16:08 -0500)]
catapult: fix sscanf buffer overflow
Caught by cppcheck. The buffer is 9+1 characters, which means we should specify
9, not 10 to the scanf string since the count does not include the
null-terminator.
Change-Id: I0aae8cce337055b304efa9399cd5d8059928d2d8
Reviewed-on: https://code.wireshark.org/review/11887
Reviewed-by: Evan Huus <eapache@gmail.com>
Pascal Quantin [Mon, 16 Nov 2015 16:20:40 +0000 (17:20 +0100)]
Qt: do not clear display filter when merging files
The merge file dialog box contains a read filter, not a display filter.
Bug: 11713
Change-Id: Iff160e552e0440ea4c626d54d834d32f38dc54c2
Reviewed-on: https://code.wireshark.org/review/11875
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Guy Harris [Mon, 16 Nov 2015 19:17:45 +0000 (11:17 -0800)]
For now, call the finish routine in Lua file writers "close".
If we ever change the way file writers work, in a fashion incompatible
with the existing way they work, we'll also rename this member - and get
rid of checks for earlier versions of the Lua interface.
Change-Id: I64065944fa31371f5249cafd930c18f180ad7299
Reviewed-on: https://code.wireshark.org/review/11879
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 16 Nov 2015 19:00:32 +0000 (11:00 -0800)]
Label the filter in the file open dialog as a "read filter".
This matches what the Windows file open dialog says, and also should
help prevent people thinking that it's a display filter, so that you can
clear it and see all the packets in the file.
I leave translations to native speakers.
Bug: 11708
Change-Id: I060816357bf7958d516429d09708a7ce16d609c5
Reviewed-on: https://code.wireshark.org/review/11877
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pascal Quantin [Fri, 13 Nov 2015 13:02:55 +0000 (14:02 +0100)]
Qt: deactivate save / close / reload buttons when rescanning a capture
Bug: 11703
Change-Id: I34f5c15c41ebbc62877945eabd3604ba90d5cf74
Reviewed-on: https://code.wireshark.org/review/11804
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>
Jim Young [Sun, 15 Nov 2015 07:49:57 +0000 (02:49 -0500)]
Qt iograph: Trigger graph refresh when time-of-day checkbox is toggeled.
Bug: 11692
Change-Id: I2d9d17d3474210b5eb73002e131867d936426e36
Reviewed-on: https://code.wireshark.org/review/11837
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Jeff Morriss [Thu, 12 Nov 2015 19:17:03 +0000 (14:17 -0500)]
Don't include wireshark-gtk.desktop in RPMs.
The RPMs use 'alternatives' to determine which GUI is used so it doesn't make
sense to have 2 desktop entries: one for 'wireshark' (Qt or Gtk GUI, depending on
configuration) and one for 'wireshark-gtk' (the Gtk GUI).
(Maybe it makes sense to just not use 'alternatives' and allow the user to pick
which GUI is used via the menu system. But then if they wanted to run the Gtk+
GUI from the command line they'd need to remember to run 'wireshark-gtk' even
if that's the only GUI installed...)
Change-Id: I9d3fe13bb01eab87caad4ad21c6571ef6288b110
Reviewed-on: https://code.wireshark.org/review/11780
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Pascal Quantin [Sun, 15 Nov 2015 21:57:43 +0000 (22:57 +0100)]
Qt: add a reference counter to sequence analysis info
Increment the reference counter each time a flow sequence window is opened.
Free seq_analysis_info_t structure once the last flow sequence / VoIP calls / SIP flow window is closed.
Bug: 11712
Change-Id: I20fcb922b0516417d4bd74cdf75475dcb31f8b90
Reviewed-on: https://code.wireshark.org/review/11851
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
Peter Wu [Fri, 6 Nov 2015 11:58:14 +0000 (12:58 +0100)]
Revert "Override optimization and other flags for make based generators."
Some compiler flags may not be passed twice (such as -mllvm
-msan-keep-going), so avoid duplicating CMAKE_C(XX)_FLAGS.
When -DCMAKE_BUILD_TYPE=<type> is set, you can override the default
optimization and debug flags with -DCMAKE_C_FLAGS_<type>=....
This reverts commit
15a238a28d0dbfffe908a6451e411a64a34da678.
Change-Id: I4e1cf11c49eaf00ad4a2c430454a127b4be20d9e
Reviewed-on: https://code.wireshark.org/review/11597
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
AdrianSimionov [Sun, 15 Nov 2015 19:57:14 +0000 (20:57 +0100)]
[docsis->ucd] Removed S-CDMA bursts and added expert
UCD Type 2 is for TDMA/ATDMA, S-CDMA goes in UCD Type 29.
More info:
Table 8-19 from RFIv2.0-C02 for DOCSIS 2.0
Table 6-25 from MULPIv3.1-I07 for DOCSIS 3.1
The comment was removed because the Burst Descriptors below are
not new anymore, are just Burst Descriptors like all the rest.
Change-Id: I992a84c9bf0b999b9cec5bd44f2e584ef22ce401
Reviewed-on: https://code.wireshark.org/review/11847
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>
Jim Young [Mon, 16 Nov 2015 03:07:55 +0000 (22:07 -0500)]
Qt iograph: Fix off-by-one, insure we plot the last interval.
Bug: 11693
Change-Id: I035eaf7ff049e3631714c112daa5adb29bb90470
Reviewed-on: https://code.wireshark.org/review/11858
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Sun, 15 Nov 2015 13:00:10 +0000 (08:00 -0500)]
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48
Reviewed-on: https://code.wireshark.org/review/11850
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 [Sun, 15 Nov 2015 22:30:04 +0000 (23:30 +0100)]
tcp: Indicate number of bits used for Flags.
Change-Id: Iac003993e820e3ad5ecbe2c9322bce1957a14c25
Reviewed-on: https://code.wireshark.org/review/11855
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Sat, 14 Nov 2015 11:33:12 +0000 (12:33 +0100)]
tcp: Revert back to the old Flags entry.
A similar issue was discussed and fixed for IP Flags in
d051e79a
(svn revision 33264).
Change-Id: I532f51e813aee707b9573537cb8fbdb823158a61
Reviewed-on: https://code.wireshark.org/review/11817
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
AdrianSimionov [Sun, 15 Nov 2015 16:19:44 +0000 (17:19 +0100)]
[docsis->type29ucd] Remove Type 4 Burst from Type 29 UCD
Most probably this was a copy/paste from packet-ucd.c
Type 4 and Type 5 bursts exist only in Type 2 UCD message.
Type 29, 35 and 51 UCD messages have only type 5 bursts.
Change-Id: I016e6b47c28f2cf69befa495848058c038603b46
Reviewed-on: https://code.wireshark.org/review/11841
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Stig Bjørlykke [Sun, 15 Nov 2015 22:00:04 +0000 (23:00 +0100)]
Lua: Fixed some argument # in argument errors.
Change-Id: I1dba41c9f129d368096dd69a0f40fa2164311124
Reviewed-on: https://code.wireshark.org/review/11852
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Guy Harris [Sun, 15 Nov 2015 20:21:41 +0000 (12:21 -0800)]
Try retroactively applying the Qt folks' fix for QTBUG-47942.
The current version of the fix only adds -fPIC under certain
circumstances; we check whether it was added and, if it was, and those
circumstances are *not* in effect, we remove it.
Bug: 11643
Change-Id: I75d0ff9b4781d7d4cd884a29bbce7d392939315c
Reviewed-on: https://code.wireshark.org/review/11849
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Peter Wu [Sat, 14 Nov 2015 23:27:53 +0000 (00:27 +0100)]
FindLUA.cmake: reject version 5.3
Lua 5.3 could still be used when located at /usr/include/lua.h. Detect
and reject it in that case.
Rename LUA_VERSION to LUA_VERSION_NUM to avoid a conflict with
pkg-config (which uses a different version format). Ensure that the
regex matches a number only.
Bug: 11706
Change-Id: Idb7e3e1a8d9c6e4ab9ab1816c4dedea7de9dde8e
Reviewed-on: https://code.wireshark.org/review/11836
Reviewed-by: Bill Meier <wmeier@newsguy.com>