Pascal Quantin [Wed, 30 Aug 2017 13:24:49 +0000 (15:24 +0200)]
extcap: fix parameters save in preferences file
Since g583150198b, extcap_arg structures holds a pointer to the current
preference value. So let's not update its value outside of the prefs API
otherwise the call to prefs_set_string_value() with pref_current done
afterwards will never notify the change and the updated value will not
be written in the preference file.
Moreover update ExtcapArgument::resetValue() method to have an empty
string instead of a NULL pointer. Otherwise prefs_set_string_value()
will not notify the change and save the restored default value in the
preference file either.
Change-Id: Ie70e79d471c75e25705c7654e420a7706ebc4032
Reviewed-on: https://code.wireshark.org/review/23308
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Martin Kaiser [Wed, 23 Aug 2017 20:16:08 +0000 (22:16 +0200)]
rpc: remove two unnecessary DISSECTOR_ASSERT()s
Their conditions are always true. Both tvb_captured_length_remaining()
and tvb_reported_length_remaining() return a gint which is always >= 0.
Change-Id: Ic0c13d17361389053466573fafff44b2c2b478ed
Reviewed-on: https://code.wireshark.org/review/23186
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Kaiser [Wed, 30 Aug 2017 20:49:11 +0000 (22:49 +0200)]
vxi11: remove some unnecessary NULL checks
Change-Id: I6a188a8c3f84284bb9dee406aee124f7e581f643
Reviewed-on: https://code.wireshark.org/review/23315
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Wed, 30 Aug 2017 19:16:51 +0000 (12:16 -0700)]
Qt: Temporarily disable DP scaling on non-macOS systems.
Enable device pixel scaling in QCustomPlot only on macOS. Blind attempt
at diagnosing / fixing bug 14012.
Change-Id: I95e38eaa072d69aef0fe1d642951603800c3a280
Ping-Bug: 14012
Reviewed-on: https://code.wireshark.org/review/23314
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
João Valverde [Wed, 30 Aug 2017 16:21:12 +0000 (17:21 +0100)]
IPv6: Undo 'ipv6_ws' tap change
Previously tapping data did not depend on ipv6_pinfo.
Minor code cleanup.
Follow up to
71697c5dab92e5be15180c6fb4420fd847e1e539.
Change-Id: I2d8ef9603119ceada64a3c64d5f9d6dfffde399d
Reviewed-on: https://code.wireshark.org/review/23312
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: João Valverde <j@v6e.pt>
Pascal Quantin [Wed, 30 Aug 2017 16:41:43 +0000 (18:41 +0200)]
LTE RRC: add SCPTMConfiguration-BR-r14 message to info column
Change-Id: I82a5625aecadc670c2b15a0ea21e3e796bcb5e63
Reviewed-on: https://code.wireshark.org/review/23313
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Wed, 30 Aug 2017 14:48:30 +0000 (16:48 +0200)]
Qt: check QVector size before accessing its content and not after
Bug: 14017
Change-Id: Ied38551c78b4593f60165d9e3b04bb3913d6b258
Reviewed-on: https://code.wireshark.org/review/23310
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>
João Valverde [Wed, 30 Aug 2017 14:14:29 +0000 (15:14 +0100)]
IPv6: Move duplicate code to update IPv6 dissection state to a function
Also make sure to protect ipv6_pinfo access with NULL checks.
Change-Id: I9495421c6bf970cb7eaa0415aa1af7effd3e7c79
Reviewed-on: https://code.wireshark.org/review/23309
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Stig Bjørlykke [Wed, 30 Aug 2017 08:45:57 +0000 (10:45 +0200)]
dmp: Improve a sanity check
Bug: 14016
Change-Id: I7dd830b143160ddd609013517f1ee3d51aac3c10
Reviewed-on: https://code.wireshark.org/review/23305
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>
AndersBroman [Wed, 30 Aug 2017 08:35:51 +0000 (10:35 +0200)]
[GSM MAP] Propagate top_tree to external message handlers.
Change-Id: Ib3d0a43c0cdeca0ed32ff4dfef13c66e485fb0fb
Reviewed-on: https://code.wireshark.org/review/23304
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>
Alexis La Goutte [Wed, 30 Aug 2017 06:00:10 +0000 (08:00 +0200)]
Add P2MP LSP Tunnel IPv4/IPv6 SENDER_TEMPLATE Object
Bug: 13977
Change-Id: I716598adbb2a75368d331cd5f705e4d737e55b08
Reviewed-on: https://code.wireshark.org/review/23301
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 [Wed, 30 Aug 2017 05:15:02 +0000 (07:15 +0200)]
RSVP: fix some missing ctype...
Change-Id: Ief081f410b6c26b4db3402d63429eba404d05144
Reviewed-on: https://code.wireshark.org/review/23300
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 30 Aug 2017 05:09:31 +0000 (07:09 +0200)]
RSVP: Add value_string for all ctype
Change-Id: I47154026ce77e550de2abecdc9092806418c6137
Reviewed-on: https://code.wireshark.org/review/23299
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Wed, 30 Aug 2017 07:06:19 +0000 (07:06 +0000)]
Revert "Add -Wused-but-marked-unused as an extra warning flag."
This reverts commit
1aaa904622245200c179d53d638bdf256cda71ab.
Change-Id: I6c783ffa40e5df9a3174cf768906e6d89ad909ef
Reviewed-on: https://code.wireshark.org/review/23303
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Alexis La Goutte [Wed, 30 Aug 2017 07:04:48 +0000 (07:04 +0000)]
Revert "Add -Wused-but-marked-unused as an extra warning flag."
This reverts commit
d846a3e8b9908caa65d182b680efb82c56c8103f.
Change-Id: I0fb9c44dbbeb2ad0f2a0a57671ca08920fb1af2a
Reviewed-on: https://code.wireshark.org/review/23302
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Michael Mann [Fri, 25 Aug 2017 19:29:17 +0000 (15:29 -0400)]
Add support for reading comments in Network Monitor files
The NetMon wiretap reads the title and description comment fields from a
NetMon file and saves it in the wiretap private structure. Then when
it's time to make a frame, the comment fields are added to a NetMon
pseudoheader with a new WTAP ENCAP type, with the potential for netmon
pseudoheader to contain pseudoheader data from "base" wiretap. Then the
netmon_header dissector displays the comment fields and passes any "base"
wiretap pseudoheader data when calling the wtap_encap dissector table
that the frame dissector normally calls.
Bug: 4225
Change-Id: I8f772bc9494364c98434c78b61eb5a64012ff3b9
Reviewed-on: https://code.wireshark.org/review/23210
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>
Chris Brandson [Tue, 29 Aug 2017 23:08:00 +0000 (16:08 -0700)]
ZigBee add missing ZCL status code
Change-Id: I3b7ec4758b32057e0a5ea8f23088dabdd7183ec2
Reviewed-on: https://code.wireshark.org/review/23298
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>
Deep Datta [Wed, 9 Aug 2017 17:00:52 +0000 (12:00 -0500)]
Adding new Ixia netflow fields for DNS hostnames and class
Change-Id: I850c008f1bd96f313811cf6404acae35496e0c3c
Reviewed-on: https://code.wireshark.org/review/23272
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Michael Mann [Tue, 29 Aug 2017 01:40:31 +0000 (21:40 -0400)]
Add Network Monitor Event Tracing event
Assigned a WTAP_ENCAP value (WTAP_ENCAP_NETMON_NET_NETEVENT) for the
dissection of Event Tracing records inside a NetworkMonitor file.
Ping-Bug: 6520
Ping-Bug: 6694
Change-Id: Ib100f3779095842e78f9b7741e80258aa866d818
Reviewed-on: https://code.wireshark.org/review/23278
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
AndersBroman [Tue, 29 Aug 2017 15:03:05 +0000 (17:03 +0200)]
[ACSE] Get rid of global variable top_tree.
Change-Id: I2084c313e778f0895a4f7a58dee445f0e742e78e
Reviewed-on: https://code.wireshark.org/review/23290
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: Tomáš Kukosa <tomas.kukosa@ixperta.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
AndersBroman [Tue, 29 Aug 2017 11:33:01 +0000 (13:33 +0200)]
[GSM MAP] Get rid of a global variable and use the new
dissector_try_uint_new() interface.
Change-Id: I714ca04f43c00017969e8655614566df4c53e5e9
Reviewed-on: https://code.wireshark.org/review/23288
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Tomáš Kukosa <tomas.kukosa@ixperta.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
AndersBroman [Tue, 29 Aug 2017 15:29:20 +0000 (17:29 +0200)]
[ANSI TCAP] Get rid of global variable top_tree.
Change-Id: Ib3f7794be4c8f38ce556d2e4d61f7df02ba8df1e
Reviewed-on: https://code.wireshark.org/review/23291
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Tue, 29 Aug 2017 05:35:07 +0000 (07:35 +0200)]
gsm_a_dtap: fix 'pinfo/len/add_string/string_len' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: I6f384e510ac77c41b3891958ec5a1b224c040e5d
Reviewed-on: https://code.wireshark.org/review/23283
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>
Alexis La Goutte [Tue, 29 Aug 2017 05:19:50 +0000 (07:19 +0200)]
gsm_a_common: fix 'pinfo/len' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: I831565d624711ebbcaf84b05e3a34dae58e1e064
Reviewed-on: https://code.wireshark.org/review/23282
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 28 Aug 2017 17:33:27 +0000 (19:33 +0200)]
RSVP: Add value_string for all ctype
Part 3
Change-Id: I7560f62124a7f20057195c7b3dfde7e6ce4c8f73
Reviewed-on: https://code.wireshark.org/review/23285
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>
Alexis La Goutte [Tue, 29 Aug 2017 05:16:12 +0000 (07:16 +0200)]
gsm_a_bssmap: fix 'len' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: Ia575e0a7d036852254327f00129d9060209411a0
Reviewed-on: https://code.wireshark.org/review/23281
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Tue, 29 Aug 2017 05:07:03 +0000 (07:07 +0200)]
fcoib: fix 'data' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: I5b24af66d982b00bcb0532d8fe31175ca18956cc
Reviewed-on: https://code.wireshark.org/review/23280
Reviewed-by: Michael Mann <mmann78@netscape.net>
Jim Young [Tue, 29 Aug 2017 04:32:43 +0000 (23:32 -0500)]
MIME based pcapng dissector: Fixup apparent copy-and-pasteos.
The MIME based pcapng dissector incorrectly displayed the EPB
Flags option's link layer error bits.
Change-Id: Ia14eec39e2a9c4432e6b3d1c0cee718ad2da1cac
Reviewed-on: https://code.wireshark.org/review/23279
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal Quantin [Mon, 28 Aug 2017 19:36:37 +0000 (21:36 +0200)]
extcap: check that argument parameter is not null before adding it to command line
Without this test, we add an argument with an empty parameter
Bug: 14006
Change-Id: I7e5313f652691808735f54b533cf5a7f7adeeae1
Reviewed-on: https://code.wireshark.org/review/23271
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: Dario Lombardo <lomato@gmail.com>
Jim Young [Sun, 27 Aug 2017 03:35:51 +0000 (22:35 -0500)]
tshark: Add delimiter to both sides of packetlist arrows
Depending on how packetlist columns are arranged certain columns may have a
Unicode arrow character inserted between it and the subsequent column to
indicate source vs destination column directionality when displayed in
tshark. Currently any inserted Unicode arrow characters are
unconditionally prefaced with an ASCII SPACE character.
Tshark's `-T tabs` option causes the various packetlist columns to be
delimited with ASCII TAB characters. The unconditional use of the SPACE
character before any inserted Unicode arrows makes it difficult to directly
compare a -T tabs report of column N values to column N+1 values without
dealing with the SPACE/Unicode Arrow suffix appended to all of the column
N values.
The inserted Unicode directionality arrows are effectively another
packetlist column of data that should be delimited like all other columns.
This patch ensures that any Unicode directionality arrows inserted between
packet list columns are delimited on both sides of the arrows with the
selected delimiter character.
Change-Id: I4eb7c6015a538afdc2c41be746eca4eec1ace36f
Reviewed-on: https://code.wireshark.org/review/23222
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Mon, 28 Aug 2017 11:42:59 +0000 (12:42 +0100)]
epan: Properly cleanup registered postdissectors
wanted_hfids member was never properly freed. Fix indentation too.
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2198
Bug: 13996
Change-Id: I8297df2158fd0ae8123223f4622ae952a218a07a
Reviewed-on: https://code.wireshark.org/review/23167
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Darien Spencer [Tue, 1 Aug 2017 18:53:06 +0000 (21:53 +0300)]
NBAP: Refactor information storing per-packet
Migrating from static variables to a single struct for
information 'carried' between different field in a NBAP packet.
Bug: 13879
Bug: 13712
Change-Id: Ie35619d64c4b9a3d5459d528788f74f952e75c11
Reviewed-on: https://code.wireshark.org/review/22902
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>
Gerald Combs [Mon, 28 Aug 2017 23:10:25 +0000 (16:10 -0700)]
CMake: We no longer support Visual C++ 2005 or 2008.
Change-Id: Ide3688366aa3c38d48ff29224dbfc0fdb7bf1b7a
Reviewed-on: https://code.wireshark.org/review/23277
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: Michael Mann <mmann78@netscape.net>
Peter Wu [Mon, 28 Aug 2017 11:40:38 +0000 (12:40 +0100)]
transum: clear the list of wanted hfids in file cleanup routine
Be sure to disable the wanted hfids list when the transum dissector is
cleaned up, otherwise it will leak memory when reloading a file while
the transum dissector is enabled.
Change-Id: I2af8edab89da8b3cfb65e19726e1d2546a1dc8d4
Reviewed-on: https://code.wireshark.org/review/23261
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Sat, 26 Aug 2017 01:37:25 +0000 (18:37 -0700)]
snort: do not unconditionally prime tcp.reassembled_in
Priming has some side-effects, do not do it unless the user explicitly
enables a preference. This transfers the owernship of wanted_hfids to
set_postdissector_wanted_hfids.
Ping-Bug: 13996
Change-Id: I77389f54d9a505cf6f2e4deb5f6ee6e508417270
Reviewed-on: https://code.wireshark.org/review/23231
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Jakub Zawadzki [Mon, 28 Aug 2017 18:24:08 +0000 (20:24 +0200)]
sharkd: handle PREF_SAVE_FILENAME, PREF_OPEN_FILENAME, PREF_DIRNAME in dumpconf.
Change-Id: I17c13c274ebd31da7d7a7ebe02821cf09f77f66c
Reviewed-on: https://code.wireshark.org/review/23268
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Mon, 28 Aug 2017 17:30:05 +0000 (10:30 -0700)]
PNIO: Fix another potential OOB write.
Bug: 13847
Change-Id: I62bb519b8e37112a59a7d209b39780f034dbcd0c
Reviewed-on: https://code.wireshark.org/review/23267
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: Michael Mann <mmann78@netscape.net>
Gerald Combs [Mon, 28 Aug 2017 21:02:46 +0000 (14:02 -0700)]
WSDG: Fix up some markup.
Change-Id: I1484e63fd9626ed507ff0077073c944cf85e3602
Reviewed-on: https://code.wireshark.org/review/23273
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Peter Wu [Sun, 27 Aug 2017 21:07:55 +0000 (22:07 +0100)]
cmake: add ENABLE_NGHTTP2 option
Allow nghttp2 to be disabled, similar to --without-nghttp2.
Change-Id: Id27ab12ef7c24a535824f762ce2feb20fba9e065
Reviewed-on: https://code.wireshark.org/review/23247
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Stig Bjørlykke [Mon, 28 Aug 2017 13:27:41 +0000 (15:27 +0200)]
extcap: Close control handles when done
Ensure the event handles are closed when done to avoid leakages.
Also improved the control reader to use WaitForSingleObject().
Change-Id: I1679d9c09e247b28117ec05c3e1b0f3ba0e99674
Ping-Bug: 13833
Reviewed-on: https://code.wireshark.org/review/23263
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>
Mikael Kanstrup [Mon, 28 Aug 2017 13:26:42 +0000 (15:26 +0200)]
Free interface_options elements on cleanup
At shutdown the array keeping all interface_options is freed.
The array elements however are not making valgrind and ASAN
complain. Make sure the elements are freed on cleanup.
Ping-Bug: 13864
Change-Id: If8b810ea5f4f11c5ce770a9ffa6c2c791bc561fe
Reviewed-on: https://code.wireshark.org/review/23265
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>
Mikael Kanstrup [Mon, 28 Aug 2017 08:38:31 +0000 (10:38 +0200)]
iface_lists: Remove locked field
It seems the locked field of interface_t was used to avoid
simultaneous updates of interface entries from either multiple
threads or most likely the recursive UI update callbacks
case later identified.
Since
802362e ("Avoid recursive scan_local_interfaces operation")
the recursive callback behavior is no longer happening. And as
code does not have consistent checks the locked field can anyway
hardly protect a multi-threaded case if such a case exists.
Remove the unnecessary locked field.
Ping-Bug: 13864
Change-Id: Idc393f702b82aa6014dd636572d00f0d67120bf3
Reviewed-on: https://code.wireshark.org/review/23262
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Mikael Kanstrup [Fri, 25 Aug 2017 11:58:20 +0000 (13:58 +0200)]
Fix leaks when active capture interface goes down
If an interface goes down while packet capture is ongoing
related interface_option element is not freed properly. Fix
by using the appropriate free function that both remove the
element and frees element members.
Ping-Bug: 13864
Change-Id: I66a11d64615dc9648441b532e4ff658ea42a5acf
Reviewed-on: https://code.wireshark.org/review/23205
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Gerald Combs [Mon, 28 Aug 2017 16:05:12 +0000 (09:05 -0700)]
Remove README.vmware
The issues it discusses were relevant in 2000 but have long since been
fixed.
Change-Id: I6284950670eba86849288bf9c88f3d22c622bdd0
Reviewed-on: https://code.wireshark.org/review/23266
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Wed, 23 Aug 2017 00:20:32 +0000 (17:20 -0700)]
Note that we probably don't support HP-UX.
(The bulk of this was written between 1999 and 2005, and hasn't been
updated since. Should we just remove it?)
Change-Id: I6c43a876cf1b4db0b1b2761323fee67377b384c3
Reviewed-on: https://code.wireshark.org/review/23166
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Mikael Kanstrup [Fri, 25 Aug 2017 09:27:38 +0000 (11:27 +0200)]
iface_lists: Access ifaces member by reference
Change access of ifaces elements from by val to by reference.
With this change unnecessary copying of the whole struct is avoided
but even more important is that elements no longer have to be
removed and inserted whenever data is updated.
This change aims to make it more clear that ifaces elements shall
never directly be removed from the array. Instead use function
capture_opts_del_iface
NOTE: Code for GTK UI not updated
Ping-Bug: 13864
Change-Id: I04b65d5ee36526b30d959b8e5a2a48a3c7c4f15b
Reviewed-on: https://code.wireshark.org/review/23204
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Mikael Kanstrup [Fri, 25 Aug 2017 08:24:36 +0000 (10:24 +0200)]
Fix leak when removing interfaces from manage interfaces dialog
When removing interfaces from the manage interfaces dialog the
interface elements where not freed properly causing leaks.
Free the interface element when removed from the array.
Ping-Bug: 13864
Change-Id: I6beb222a5475278cfc6cb454a7c8b2c86f636f38
Reviewed-on: https://code.wireshark.org/review/23203
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Mikael Kanstrup [Fri, 25 Aug 2017 08:14:15 +0000 (10:14 +0200)]
Free interface elements on cleanup
At shutdown the array keeping all network interfaces is freed.
The array elements however are not making valgrind and ASAN
complain. Make sure the elements are freed on cleanup.
Ping-Bug: 13864
Change-Id: I1efeb03f42fb6f0b87dada8ef50d85f47f93e0dc
Reviewed-on: https://code.wireshark.org/review/23202
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Mikael Kanstrup [Thu, 24 Aug 2017 14:16:34 +0000 (16:16 +0200)]
iface_lists: Access all_ifaces member by reference
Change access of all_ifaces elements from by val to by reference.
With this change unnecessary copying of the whole struct is avoided
but even more important is that elements no longer have to be
removed and inserted whenever data is updated.
This change aims to make it more clear that all_ifaces elements
shall never be removed from the array without freeing resources
via the capture_opts_free_interface_t function.
NOTE: Code for GTK UI not updated
Ping-Bug: 13864
Change-Id: I36742cb1d5c8daa136c9d3732a044a7c8e5c7fe7
Reviewed-on: https://code.wireshark.org/review/23201
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>
Alexis La Goutte [Mon, 28 Aug 2017 04:52:03 +0000 (06:52 +0200)]
OSPF: fix LSA type filter
Bug: 13979
Change-Id: Ibf0229aba48cdb8d2d4c30c17723be4bb9cca476
Reviewed-on: https://code.wireshark.org/review/23253
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, 22 Aug 2017 09:29:20 +0000 (11:29 +0200)]
RSVP: Add value_string for all ctype
Change-Id: I1bbbbceccaa6883f36741b0e4c3d5b8cfb0204fc
Reviewed-on: https://code.wireshark.org/review/23252
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>
Stig Bjørlykke [Mon, 28 Aug 2017 06:36:03 +0000 (08:36 +0200)]
Qt: Fix build without libpcap
Change-Id: I9b9b5de1beb23486ccc000feda54c2b20a33f4ad
Reviewed-on: https://code.wireshark.org/review/23251
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Alexis La Goutte [Sun, 27 Aug 2017 15:50:53 +0000 (17:50 +0200)]
infiniband: fix bitmap for Remote CM Response Timeout / Transport Service Type
Issue reported by Yao Lin
Ping-Bug: 13997
Change-Id: Ia90e58826c228500da0177fa2b8b90ec9ec2ff74
Reviewed-on: https://code.wireshark.org/review/23237
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>
Peter Wu [Sat, 26 Aug 2017 01:32:59 +0000 (18:32 -0700)]
prefs: fix memleaks with obsolete preference modules
ASAN reported a memleak in the USB CCID dissector due to the use of
prefs_register_protocol_obsolete which caused prefs_cleanup to skip
freeing preferences inside such modules.
Change-Id: Ib4aecb3a722f958a8a1c5fc636703c1ec977f0cd
Reviewed-on: https://code.wireshark.org/review/23230
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Håkon Øye Amundsen [Fri, 25 Aug 2017 09:28:34 +0000 (11:28 +0200)]
extcap: Interface Toolbar support on Windows
Add support for extcap control pipes on Windows.
Improved read loop in InterfaceToolbarReader.
Delay opening control pipes until extcap has opened the fifo pipe.
Make extcap_example.py work on Windows.
Bug: 13833
Change-Id: I4b47d25452637759b8a3be53be48eee5365bc0e4
Reviewed-on: https://code.wireshark.org/review/23211
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>
Alexis La Goutte [Sun, 27 Aug 2017 10:22:22 +0000 (12:22 +0200)]
Revert "infiniband: swap Local CM Response Timeout / Retry Count field"
Follow the order of spec
This reverts commit
4b8fee9da8c19cb64a8ee0c6ab45883f83c764a3.
Change-Id: Ifeaf2c68813f8c452b6ab0247cd7a4313c95f619
Reviewed-on: https://code.wireshark.org/review/23236
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Sun, 27 Aug 2017 17:21:00 +0000 (19:21 +0200)]
gsm_a_bssmap: fix 'pinfo' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: I041b7c9363e75f0ec54ea29ea3d39e92f6ce8b6a
Reviewed-on: https://code.wireshark.org/review/23239
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>
Guy Harris [Sun, 27 Aug 2017 21:19:39 +0000 (14:19 -0700)]
Add -Wused-but-marked-unused as an extra warning flag.
We can't just turn it on yet, because that would require generators to
know which generated functions use which parameters and mark only the
unused ones as such. The generator that turns PIDL files into DCE RPC
dissectors is one that would have to be fixed.
Change-Id: I7b0e9b08de6e7e9e611143de7307d3323a5c913e
Reviewed-on: https://code.wireshark.org/review/23249
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 27 Aug 2017 20:55:14 +0000 (13:55 -0700)]
Add -Wused-but-marked-unused as an extra warning flag.
We can't just turn it on yet, because that would require generators to
know which generated functions use which parameters and mark only the
unused ones as such. The generator that turns PIDL files into DCE RPC
dissectors is one that would have to be fixed.
Change-Id: I42013c8983d01fd3eca4026358b37ba043f12190
Reviewed-on: https://code.wireshark.org/review/23246
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 27 Aug 2017 20:49:04 +0000 (13:49 -0700)]
err_info is used, so don't mark it unused.
Change-Id: Ibd89fcb8e9fc2aa7e368eb8723fb367db5e8d11e
Reviewed-on: https://code.wireshark.org/review/23245
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sun, 27 Aug 2017 20:47:22 +0000 (13:47 -0700)]
pinfo is used, so don't mark it unused.
Change-Id: Ife237343cdf051be836c2e2d3de1b00fc3902708
Reviewed-on: https://code.wireshark.org/review/23244
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Sun, 27 Aug 2017 17:24:14 +0000 (19:24 +0200)]
diameter_3gpp: fix 'pinfo' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: Iefec98b1bbb47eec4df684933df4b44197dd9164
Reviewed-on: https://code.wireshark.org/review/23242
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Sun, 27 Aug 2017 17:25:57 +0000 (19:25 +0200)]
dpnet: fix 'tree' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: Ib90069304e384b707fc64fd68ef52db108758917
Reviewed-on: https://code.wireshark.org/review/23243
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Sun, 27 Aug 2017 17:22:29 +0000 (19:22 +0200)]
cfm: fix 'pinfo' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: I046a37a07cdaad6db2132efbfbbc9dbfa0055bec
Reviewed-on: https://code.wireshark.org/review/23240
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Sun, 27 Aug 2017 17:23:20 +0000 (19:23 +0200)]
devicenet: fix 'buf_len' was marked unused but was used [-Wused-but-marked-unused]
Change-Id: Id16edc055ed675076fe015b84bf37f1bef90ddbf
Reviewed-on: https://code.wireshark.org/review/23241
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Peter Wu [Fri, 25 Aug 2017 18:19:06 +0000 (11:19 -0700)]
Lua: fix crash on invalid Dissector.list("food") invocation
The Dissector.list, Listener.list and Field.list functions do not accept
a parameter. Passing one however results in a crash because the first
element is not the expected table, but the first function parameter.
Change-Id: I8483d0aa20716045472f30f5b41a449bed549b05
Reviewed-on: https://code.wireshark.org/review/23209
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Alexis La Goutte [Sat, 26 Aug 2017 08:17:16 +0000 (10:17 +0200)]
nvme: fix wrong encoding for SQ Header Point
Need to use LITTLE_ENDIAN
Bug: 14008
Change-Id: I3697bb53e0832a9465e8be465b3587e9b78d2f0d
Reviewed-on: https://code.wireshark.org/review/23229
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>
Gerald Combs [Sun, 27 Aug 2017 08:07:00 +0000 (08:07 +0000)]
[Automatic update for 2017-08-27]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: Ia4e22a8679dc08ee4f260fe6168678f7dd11f2eb
Reviewed-on: https://code.wireshark.org/review/23224
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Pascal Quantin [Sat, 26 Aug 2017 20:32:58 +0000 (22:32 +0200)]
Update USBPcap to 1.2.0.3
Change-Id: Ie5dbe818e214738ea8e82fe7d72fc8a20b30691b
Reviewed-on: https://code.wireshark.org/review/23221
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>
Darien Spencer [Sun, 20 Aug 2017 18:38:32 +0000 (21:38 +0300)]
NBAP: Replaced a comment
Edited a comment to explain the usage of the 'hs-dsch physical layer category' field
Change-Id: I400eabd764818bbc39ab1128500b8700647175e3
Reviewed-on: https://code.wireshark.org/review/23218
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>
Stig Bjørlykke [Sat, 26 Aug 2017 09:21:52 +0000 (11:21 +0200)]
wiretap: Add WTAP_ENCAP_NORDIC_BLE
Use this for nordic_ble dissection.
Change-Id: I5323cbd8c244c4e3b645825c60d040e1ae8f3b81
Reviewed-on: https://code.wireshark.org/review/23219
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Alexis La Goutte [Fri, 25 Aug 2017 11:50:42 +0000 (13:50 +0200)]
infiniband: fix infiniband: sIP and dIP inside IP CM Private Data are decoded in the wrong order
Issue reported by Yao Lin
Bug: 14002
Change-Id: Ib49f74edbaac4830340fb9d7dba5105f0bdeb2f1
Reviewed-on: https://code.wireshark.org/review/23200
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>
Darien Spencer [Fri, 25 Aug 2017 14:22:14 +0000 (17:22 +0300)]
FP: Refactored duplicate code
The 'get packet info from conversation' code was shared in both the 'if' and 'else' cases
Also fixed a comment about the packet's direction
Change-Id: I83568a5be7cba094aea925bdbc70479e50377477
Reviewed-on: https://code.wireshark.org/review/23207
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>
Mikael Kanstrup [Fri, 25 Aug 2017 12:05:42 +0000 (14:05 +0200)]
Fix leaked timestamp records
Valgrind reports leaked timestamp records.
A comment stated that the timestamp info members only contain
static data. That claim was only true for some cases, not all so
make all cases allocate memory and have them properly freed when
removed.
Fixes: aca55a2 ("Add hardware timestamping support")
Change-Id: I31e4689070019ad1f531008394e7d6e48318c70c
Reviewed-on: https://code.wireshark.org/review/23206
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Fri, 25 Aug 2017 17:20:59 +0000 (10:20 -0700)]
CMake: Package list updates.
Move gcrypt to the required package section. Fold the various
xxx_REQUIRED variables into xxx_OPTIONS.
Change-Id: Ib4220d7344e2bbac9062465d175921733bb0fe52
Reviewed-on: https://code.wireshark.org/review/23208
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Alexis La Goutte [Fri, 25 Aug 2017 11:35:25 +0000 (11:35 +0000)]
zbee-zcl: fix parameter 'cluster_id/dir' not found in the function declaration [-Wdocumentation]
Change-Id: I9b0f7d0eefe932e00629269a85ede612438354cf
Reviewed-on: https://code.wireshark.org/review/23199
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>
Sergey Avseyev [Fri, 25 Aug 2017 07:51:49 +0000 (10:51 +0300)]
couchbase: update HELLO features
Change-Id: Icff1932cd41334fcf04016f3616a99ac4293ebef
Reviewed-on: https://code.wireshark.org/review/23198
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: 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 [Fri, 25 Aug 2017 05:56:21 +0000 (07:56 +0200)]
802.11: fix display of PMK-KO (R0KH-ID)
Issue reported by Spice Boy
Bug: 14004
Change-Id: If49ec807ee54b8991653b7a3584baade59069894
Reviewed-on: https://code.wireshark.org/review/23197
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 [Thu, 24 Aug 2017 06:05:01 +0000 (08:05 +0200)]
infiniband: swap Local CM Response Timeout / Retry Count field
Change-Id: Id693a83292ac7c3683a8e24a58dd452d828125d7
Ping-Bug: 13997
Reviewed-on: https://code.wireshark.org/review/23189
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>
Dylan Ulis [Fri, 25 Aug 2017 01:56:45 +0000 (21:56 -0400)]
btatt: Fix request response arrows
Change-Id: I40f61a8b8319605035f2a5c3685a3e8561d76921
Reviewed-on: https://code.wireshark.org/review/23196
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Chris Bontje [Thu, 24 Aug 2017 14:41:44 +0000 (08:41 -0600)]
[packet-selfm] - Fix dissection of multiple PDUs in single packet with no Fast Meter config data present.
Change-Id: I69cc2430e2f75d297f4bee3397c191d6f8e9091f
Reviewed-on: https://code.wireshark.org/review/23194
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 [Thu, 24 Aug 2017 06:00:25 +0000 (08:00 +0200)]
GTP: fix wrong bitmap for gtp.ext_comm_flags_II_pmtsmi field
Issue reported by Sudarshan Chettri
Bug: 14001
Change-Id: I03a37adb6e77201191f424b300fa917bf11afac4
Reviewed-on: https://code.wireshark.org/review/23188
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Thu, 24 Aug 2017 07:51:04 +0000 (09:51 +0200)]
nordic_ble: Fix calculating delta time start to start
The calculation must be based on the length of the previous packet,
not the last packet selected in the list.
Also mark this entry as generated.
Change-Id: I2e0a30ce28f5824f73ffe2d90d3043ff309292dc
Reviewed-on: https://code.wireshark.org/review/23191
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>
AndersBroman [Thu, 24 Aug 2017 07:57:36 +0000 (09:57 +0200)]
[BSSGP] Handle Overload msg and code cleanup.
Change-Id: I625030263675b014b2d42cc04aef6794354b2893
Reviewed-on: https://code.wireshark.org/review/23192
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Sun, 20 Aug 2017 17:33:53 +0000 (13:33 -0400)]
Extract the "long name" out of the manuf file and use it for some resolution
Some places (like MAC resolution) want to keep a fixed length, but for places
that want to display "full organization name", save the long name that is
treated as a comment in the manuf file.
Have make-manuf convert companies with all caps to mixed case so we're not
screaming the company name at the user.
Convert the manuf.tmpl to be tab delimited without a comment for the "long name"
so it can match the format now created by make-manuf.
Remove uint_get_manuf_name as it was unnecessary.
Bug: 3666
Change-Id: If2af5a1ce64e2784fe3941eeae8d8093d4f1467b
Reviewed-on: https://code.wireshark.org/review/23150
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>
Alexis La Goutte [Wed, 23 Aug 2017 19:01:17 +0000 (21:01 +0200)]
infiniband: fix bitmap for Local CM Response Timeout / Retry Count
Issue reported by Yao Lin
Ping-Bug: 13997
Change-Id: I84fbf70b1871ce740f52b1b9dd9c1b8ed2af41e3
Reviewed-on: https://code.wireshark.org/review/23183
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>
Martin Kaiser [Wed, 23 Aug 2017 19:53:42 +0000 (21:53 +0200)]
rpc: remove some unnecessary NULL checks
Change-Id: I956f0dbbd6b3cdbf8c0e4b9d81e0bd6408874b5b
Reviewed-on: https://code.wireshark.org/review/23185
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Wed, 23 Aug 2017 21:46:24 +0000 (14:46 -0700)]
Update the AsciiDoc button macro name.
Change the name of the button macro to "btn" in order to be compatible
with AsciiDoctor.
Change-Id: I673e0fe0ae7b343abeb1afba0b9b11402efdf0d6
Reviewed-on: https://code.wireshark.org/review/23187
Reviewed-by: Gerald Combs <gerald@wireshark.org>
João Valverde [Wed, 23 Aug 2017 14:29:58 +0000 (15:29 +0100)]
RADIUS: Add comment for RFC 6929 preference
Change-Id: I084923204cd1017f9e50052b41106ab44dc9b1af
Reviewed-on: https://code.wireshark.org/review/23176
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>
Gerald Combs [Wed, 23 Aug 2017 18:49:28 +0000 (11:49 -0700)]
Docbook: Fix a couple of include paths.
Change-Id: I1b06658f516a17516782df57943d7082badba755
Reviewed-on: https://code.wireshark.org/review/23182
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Phil Beeson [Wed, 23 Aug 2017 06:08:55 +0000 (08:08 +0200)]
BTLE: fix bitmap for link data Hop / Sleep Clock Accuracy
Bug: 13990
Change-Id: I4d5acaf580adbe2c5bff1aac3d2837a8842cd519
Reviewed-on: https://code.wireshark.org/review/23172
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Gerald Combs [Wed, 23 Aug 2017 16:32:05 +0000 (09:32 -0700)]
Update WinSparkle to 0.5.6.
Change-Id: I93d95bba740bb3e0a4754ec71460f30ef1e45a9a
Reviewed-on: https://code.wireshark.org/review/23178
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Stig Bjørlykke [Sat, 19 Aug 2017 21:39:21 +0000 (23:39 +0200)]
extcap: Create unique pipe names for each interface
On Windows the pipe names does not get random characters appended.
Add the interface name and pipe type to make it unique.
This partly fixes the issue with capturing from multiple extcap
interfaces on Windows.
Ping-Bug: 13653
Ping-Bug: 13833
Change-Id: I4290b37cf789bf77608993682a803aca29513d28
Reviewed-on: https://code.wireshark.org/review/23158
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>
Ulf [Wed, 23 Aug 2017 01:52:29 +0000 (21:52 -0400)]
Fix potential oob write crashes
Bug: 13847
Change-Id: I3a706db25204fe4c1fd1b7be3b17b8c55365dccf
Reviewed-on: https://code.wireshark.org/review/23169
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 [Wed, 23 Aug 2017 00:38:55 +0000 (20:38 -0400)]
packet-bgp.c: using wmem_packet_scope() for decode_evpn_nlri_esi
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2736
Bug: 13995
Change-Id: Ia304251249e023a77a8fa3a650ef1640c3c2f314
Reviewed-on: https://code.wireshark.org/review/23168
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Tue, 22 Aug 2017 17:33:49 +0000 (10:33 -0700)]
Fix a typo.
Change-Id: I26fb82c00ef3ac1343930e473294a3aa338f3f96
Reviewed-on: https://code.wireshark.org/review/23164
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Guy Harris [Tue, 22 Aug 2017 17:37:46 +0000 (10:37 -0700)]
Use the Wayback Machine for the PDML spec.
It's not available at the old URL any more.
Change-Id: Id8baba5e02cf0e3227365f53a11caa054ef2c40f
Reviewed-on: https://code.wireshark.org/review/23165
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Dario Lombardo [Tue, 22 Aug 2017 14:09:48 +0000 (16:09 +0200)]
commandline: fix compilation without pcap.
Change-Id: I37b9dd3f9515948a5ccf72cd2fd76fc1251c9294
Reviewed-on: https://code.wireshark.org/review/23161
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 [Tue, 22 Aug 2017 14:10:06 +0000 (16:10 +0200)]
Qt: fix compilation without pcap.
Change-Id: I277059e018a41ea011043d255508db4c5f05f63d
Reviewed-on: https://code.wireshark.org/review/23162
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Ahmad Fatoum [Tue, 22 Aug 2017 09:00:28 +0000 (11:00 +0200)]
Fix requesting hardware timestamps without -k
The interface_options struct passed to dumpcap is populated
differently when running Wireshark with and without -k.
Previously, only with -k was there a valid pointer in
interface_opts.timestamp_type
Fixes: aca55a2 ("Add hardware timestamping support")
Signed-off-by: Ahmad Fatoum <ahmad.fatoum@siemens.com>
Change-Id: Ic7ecc5a1190c28197d6a7271f1b353f74d43ca61
Reviewed-on: https://code.wireshark.org/review/23160
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>