git.samba.org - metze/wireshark/wip.git/log

[H248 3GPP] Add dissection of IP transport package.

Change-Id: If0b7d4a46dd251816d9a093c394743838112824d
Reviewed-on: https://code.wireshark.org/review/20565
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>

Lua: Run protofield test with tree

Only perform the protofield with a tree.

Change-Id: I93caeb505d1138a57c846ea6c295e5a44d72023c
Reviewed-on: https://code.wireshark.org/review/20564
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>

CoAP: Enhancements to improve conversation recording.

Conversation recording now uses a hash map instead of a tree. URI
reconstruction for responses has also been added to assist Thread CoAP
decoding.

Change-Id: I83dc0dc48534d5182cf37ba50dad67e1b095188a
Reviewed-on: https://code.wireshark.org/review/20553
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

proto_dlg.c: Convert GSList into wmem_tree

Change-Id: Ice643361e91bded91547428d7fbb7cdff969664f
Reviewed-on: https://code.wireshark.org/review/20383
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

TGPP.xml: add a new enum value for Specific-Action AVP

Change-Id: If45c6b196fc55ff7452f83e022b585cb9a816d53
Reviewed-on: https://code.wireshark.org/review/20562
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

g_assert on device.if_info.name to prevent undefined behaviour.

Change-Id: Id730eb0e846e557c2f5a47139b480362a0b2a777
Reviewed-on: https://code.wireshark.org/review/20561
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

Add support for verifying CIP Safety CRC values.

Change-Id: I44f7ff6980f27b1a0d4199a91f9b217aec7e4652
Reviewed-on: https://code.wireshark.org/review/20557
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>

QUIC: Add TBKP (Token Binding Key Params) tag

Change-Id: Ie7be38fc605d4c93f4e5488c9472909f6644e8c5
Reviewed-on: https://code.wireshark.org/review/20559
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>

dhcpv6: Add Captive Portal option (103)

Change-Id: Ib56a1e9d1353d3245715bb0b5ba20672548bb9c1
Ping-Bug: 13483
Reviewed-on: https://code.wireshark.org/review/20555
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>

PROFINET: Remove AMFilterData Block

Since AMFilterData block is removed from PROFINET specification,
related parts are removed from dissector.

Change-Id: I0f9f346fd409fc0cb78f4d7a8ca5869229d68bed
Reviewed-on: https://code.wireshark.org/review/20546
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>

[GTPv2] Don't try to dissect Target to Source Transparent Container it's
not so easy to determine it's content.

Change-Id: I58d5caeb5b7264afa1ed28e84c0207610d5c13d2
Reviewed-on: https://code.wireshark.org/review/20558
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>

Lua: Add absolute time base values

Add ABSOLUTE_TIME_* defines to the base table in init.lua for use
in ProtoField.absolute_time.

Change-Id: I5c99eafdac97655d71fd4f3374294cd587afaf0a
Reviewed-on: https://code.wireshark.org/review/20543
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Lua: Merge sep and str tables into base

Also add documentation strings to the base values.

Change-Id: I00ac8f154fdd0382106ed27d740e16956520be97
Reviewed-on: https://code.wireshark.org/review/20554
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

ftypes: move set_value_floating into the union

Delete set_value_floating from struct _ftype_t, make it
part of the set_value union.

Change-Id: Ic00e1c70488ddc4422c34657c62af7dc07db02d9
Reviewed-on: https://code.wireshark.org/review/20556
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt: Disable "Show hidden interfaces"

Disable the "Show hidden interface" option until bug 13354 is fixed
because it's not possible to capture from hidden interfaces yet.

Ping-Bug: 13354
Change-Id: I428c2698485f0c7c2d9a8ab8408d7129af5fecf1
Reviewed-on: https://code.wireshark.org/review/20528
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

Added Heuristic dissectors for the following UMTS FP channels:
DCH (Downlink and Uplink), FACH, RACH and PCH
Note that the existing heuristic dissection function does not correctly dissect any of the above and, frankly, I'm not sure which cases it covers.

Change-Id: I832bfdccc9ae760a42a4c6537052ee2fee9262b4
Reviewed-on: https://code.wireshark.org/review/20439
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>

ZigBee NWK: Add zero length beacon checks to avoid assert.

Add a zero length check on beacon to avoid assert when beacon payload is
non existent.

Change-Id: I016a97bda1590b8edc68db4f47e5c814e4eb8e0a
Reviewed-on: https://code.wireshark.org/review/20550
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

ftypes: move set_value_sinteger64 into the union

Delete set_value_sinteger64 from struct _ftype_t, make it
part of the set_value union.

Change-Id: I76668f0a6455c5d75c703cd4f440757601246bdb
Reviewed-on: https://code.wireshark.org/review/20551
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>

CIP: Log more errors when expected data is missing

1. CIP: Instead of exiting early in dissect_cip_generic_service_req/rsp when there is no data, keep processing so that a malformed packet warning will be displayed when there should be data.
2. CIP Safety: Remove copy-paste. Use load_cip_request_data
3. CIP Safety: Use more constants.

Change-Id: Ic364201f1e587b43cf2bda407fb77b50032974ae
Reviewed-on: https://code.wireshark.org/review/20549
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Lua: Check for no table in ProtoField unit string

When using base.UNIT_STRING in a ProtoField the table must be given.

Change-Id: Ie4beb93b5597a97a99939ef2c60a1ee7ece328f2
Reviewed-on: https://code.wireshark.org/review/20542
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

[GSM-A-BSSMAP] Update MSG content according to 3GPP TS 48.008 V13.3.0
(2016-09)
All IEs are not dissected.

Change-Id: If215b85ba1f786d9b4cb518c7525aec58d000f8e
Reviewed-on: https://code.wireshark.org/review/20548
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>

ieee80211-radio: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: I7f5f25b0afd30612d9e20e52585c7cad70bc1f59
Reviewed-on: https://code.wireshark.org/review/20468
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: Peter Wu <peter@lekensteyn.nl>

v150fw: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: I04e781b12a2b89999bf628ceaa66b8527dd591aa
Reviewed-on: https://code.wireshark.org/review/20471
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: Peter Wu <peter@lekensteyn.nl>

DTLS: Cookie formatting fix for HVR

Cookie format for HelloVerifyRequest inconsistent with that in
ClientHello. Changed to be consistent.

Change-Id: I79809ebc4bd4a1c5b43b44a21f58ad5b5d5a1bcf
Reviewed-on: https://code.wireshark.org/review/20544
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Lua: Improve base checking for signed integer

Check base value for signed integer before unsigned to avoid a case
where the valid bases for a unsigned integer is presented in a error
message when a signed type is used.

Change-Id: Idfb87597779652e32adceacad220d748afda5e85
Reviewed-on: https://code.wireshark.org/review/20541
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

Lua: Layout cleanup in init.lua

Remove double start-of-comments and some leading spaces.

Change-Id: I1c5ba49990076cc2d32da2d0a3bb0f54ec31e823
Reviewed-on: https://code.wireshark.org/review/20540
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

[GSM-A-BSSMAP] Correct and enhance dissection of HANDOVER COMPLETE

Change-Id: Ie65fc6c9f0cd2291d7e1421fbbedff097c7e09df
Reviewed-on: https://code.wireshark.org/review/20545
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>

Lua: Add some ProtoField tests.

Test usage of base.UNIT_STRING.

Change-Id: I9c97b58b3cc6db65713e83609900880e157237f2
Reviewed-on: https://code.wireshark.org/review/19357
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

PROFINET: Fix the Asset Management Record Dissection

Dissecting AMR doesn't work properly when AM_Location.Structure don't equal to 2.

Bug: 13480
Change-Id: Ie116e10f6e88e240b2f1ae4e1eab27b24350e55a
Reviewed-on: https://code.wireshark.org/review/20529
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Birol Capa <birol.capa@siemens.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

ftypes: move set_value_uinteger64 into the union

Delete set_value_uinteger64 from struct _ftype_t, make it
part of the set_value union.

Change-Id: I12407b7336282daa60fe6e0e742d65e205dc84fd
Reviewed-on: https://code.wireshark.org/review/20539
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>

bootp: Add Captive-Portal option (160)

Thanks to David Bird for pcap

Bug: 13483
Change-Id: Id53eadd5faa7599c3864840aa80a8770099baac3
Reviewed-on: https://code.wireshark.org/review/20531
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>

Bluetooth: "dublicates" -> "duplicates"

Change-Id: Ie52c6ef60c911d1e119c5b69de6f64a88b3433f3
Reviewed-on: https://code.wireshark.org/review/20534
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Fix buffer overrun in try_bytesprefix_to_str

bytes_string list contains a list of prefixes to match, not the other
way round (matching prefixes in the list).

Bug: 13479
Change-Id: Ie625dc5db30bd55158d688a0101f35d0bf6906af
Fixes: v2.3.0rc0-2644-g540b555729 ("Introduce "bytes_string" type, similar to "value_string"")
Reviewed-on: https://code.wireshark.org/review/20532
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Lua: Base must be base.DEC or base.UNIT_STRING for signed integer

Reject ProtoField signed integer types with base other than base.DEC
and base.UNIT_STRING. Update documentation for this.

Bug: 13484
Change-Id: I55a636c89704e96a598f1f185faabd8ad13d96f1
Reviewed-on: https://code.wireshark.org/review/20533
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>

tap-iostat (cli): fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7

Change-Id: Idd8f4e2175d6575beecaccf2ee018457a25fd225
Reviewed-on: https://code.wireshark.org/review/20493
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

ftypes: move set_value_sinteger into the union

Delete set_value_sinteger from struct _ftype_t, make it part of the
set_value union.

Change-Id: I084c4c9beba9978b538d359ebaac21391ebd7f82
Reviewed-on: https://code.wireshark.org/review/20523
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

Qt: Use em dash when hide the "Show" checkbox

Match the style used in "Capture Interfaces" table when elements
are N/A by using the em dash. This item should also be disabled
using QPalette::Disabled to get a even better match.

Change-Id: I127ce309318df2c36515996df8584d1e4ce690c0
Reviewed-on: https://code.wireshark.org/review/20527
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>

ftypes: move set_value_uinteger into the union

Delete set_value_uinteger from struct _ftype_t, make it part of the
set_value union.

Change-Id: I26de15be8ea0ede76236a8f8a4958bfd97ad9d52
Reviewed-on: https://code.wireshark.org/review/20521
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>

erf: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: I1634b0a7b0fa35ea59ef2fc7fbe0b81f77aad978
Reviewed-on: https://code.wireshark.org/review/20508
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

dis: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: I8d28637d5262fd0e06d80607adb6f88b3d909a9e
Reviewed-on: https://code.wireshark.org/review/20465
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

cigi: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: I1f755c876150f204cce95932698c3f4e96fd465d
Reviewed-on: https://code.wireshark.org/review/20426
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

ieee80211-prism: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: Ic3c4a4347ab501c1ee22a25dd3dd41609d28418f
Reviewed-on: https://code.wireshark.org/review/20467
Reviewed-by: Anders Broman <a.broman58@gmail.com>

rpcap URLs *require* the :<port> argument for remote capture - update manpage.

Change-Id: Iabae39347bc0058d106a9b00d81629899bc93249
Reviewed-on: https://code.wireshark.org/review/20526
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

Catch read errors and zero-length records, as opposed to short reads/EOF.

Also, if we return WTAP_OPEN_ERROR from an open routine after we've set
our close routine, that routine is called, which frees up our private
data structures; don't free them ourselves before returning
WTAP_OPEN_ERROR.

Change-Id: I03eebe1a1677e2161fdacec8de14668093cf03a3
Reviewed-on: https://code.wireshark.org/review/20522
Reviewed-by: Guy Harris <guy@alum.mit.edu>

ftypes (trivial): fix two comments

The comments give the name of the struct _ftype_t component that is
initialized. They are wrong in two places. This confuses my script that
deletes the initializers for the components which were moved into the
union.

Change-Id: I876fb29305a94b241df07c97064f31378752b559
Reviewed-on: https://code.wireshark.org/review/20520
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

PROFINET: Extend System Redundancy Support

A special ARType for System redundancy IOCARSR (0x0020) used to indicate
SR during the IODConnectReq for Advanced Startup ARs (StartupMode:=1).
With this change, the ARUUID is subdivided into several parts.
APDUStatus dissection is affected by Primary/Backup switchover.

Bug: 13456
Change-Id: I0504ad2f4d15c491b0142c6d24bb8b849a929ba2
Reviewed-on: https://code.wireshark.org/review/20422
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Qt: hide the "Show" checkbox for default devices

When marking a previously hidden device as default (e.g. via wireshark
-ocapture.device:eth0), an unchecked checkbox is visible. This is just
confusing, just hide the checkbox completely.

Change-Id: I3f85cfcb659c351c72237dced52f0684733188c4
Reviewed-on: https://code.wireshark.org/review/20478
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>

netscaler: Sanity check record size

Bug: 13478
Change-Id: I6be2972979ff7cabf27e70d236c581d539d6ddac
Reviewed-on: https://code.wireshark.org/review/20515
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

packet-wbxml.c: Fix potential infinite loops

Bug: 13477
Change-Id: Ib6c440bbcbb5011e8f23fb87418acd87bb38c272
Reviewed-on: https://code.wireshark.org/review/20513
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>

[Automatic update for 2017-03-12]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I5718e7c7df8061f81eb01973f504ebbb0cfe1e44
Reviewed-on: https://code.wireshark.org/review/20511
Reviewed-by: Gerald Combs <gerald@wireshark.org>

llrp: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: I2bc9b5b50b8698c27f2a56b869de318fa98bf7b1
Reviewed-on: https://code.wireshark.org/review/20469
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

ieee80211: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I53bca9bc50d18a88cc6c5c5a7ae93bdd1b772903
Reviewed-on: https://code.wireshark.org/review/20504
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>

tfshark: fix this ‘if’ clause does not guard... [-Wmisleading-indentation]

Change-Id: If66223021d074e6cb3c7bde2af7cca9c72acb8c6
Reviewed-on: https://code.wireshark.org/review/20507
Reviewed-by: Michael Mann <mmann78@netscape.net>

sharkd: fix tap memleaks & support for links to frame, url & cleanup

Change-Id: I08af04c7882802035344d0051055be05967fb089
Reviewed-on: https://code.wireshark.org/review/20502
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

ieee80211: fix declaration of 'ieee80211_tag_...' shadows a global declaration

Make OSX buildbot happy

Change-Id: I1a376fba3d7f4b24741839697ed0f6c55c9ac77d
Reviewed-on: https://code.wireshark.org/review/20503
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>

radius: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: I654ead4d834af90e14568a54c7a914a3774c05bc
Reviewed-on: https://code.wireshark.org/review/20470
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

gmr_rach: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: I3313ea62fd86b0a7a3ae6dfbc40bd6e0841316a2
Reviewed-on: https://code.wireshark.org/review/20466
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

dcerpc (netlogon): fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: I96b8a8c5157dc89785421282f2c509c100fb0504
Reviewed-on: https://code.wireshark.org/review/20464
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

catapult-dct2000: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

Change-Id: If3afda940b40500e067467b341f192bbaef173bc
Reviewed-on: https://code.wireshark.org/review/20425
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

ansi_a: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7

All users of the ELEM_OPT_TLV and ELEM_MAND_TV macros pass an empty string ("")
for the elem_name_addition parameter, so it can never be NULL. The Coverity
warning was about a superfluous check (elem_name_addition[0]=='\0'). All of
these checks are superfluous anyway since both branches yield an empty string.

Change-Id: I28c994fd5e10c04f99c8d77e9aee18afd4a26412
Reviewed-on: https://code.wireshark.org/review/20427
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
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: Peter Wu <peter@lekensteyn.nl>

tshark and tfshark require -2 when using -R. Document this.

Change-Id: I3ef802ed1163512e20da10eaa8da3239107b6fae
Reviewed-on: https://code.wireshark.org/review/20509
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

afn(.h) fix indent

use 4 spaces like afn.c

Change-Id: Iadc6d6e3b2919c7014eccc2890966eadd7d7bee7
Reviewed-on: https://code.wireshark.org/review/20506
Reviewed-by: Anders Broman <a.broman58@gmail.com>

afn(.c): fix indent (align field)

Change-Id: Ie2cc66b8ba26278490134974662acd554b8931f9
Reviewed-on: https://code.wireshark.org/review/20505
Reviewed-by: Anders Broman <a.broman58@gmail.com>

BGP: Update Transitive Four-Octet AS-Specific Extended Community Sub-Types and remove duplicate marcos.

Change-Id: I87454ea95bc64a39e4e60ba374e9cafb574e744c
Reviewed-on: https://code.wireshark.org/review/20501
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>

802.11: Use proto_tree_add_bitmask

Change-Id: If46ccea1c58448d2dacad07fb3171e423babe59f
Reviewed-on: https://code.wireshark.org/review/19562
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>

Qt: Give discard button focus (but not as default)

Set focus to the discard button in the "Unsaved packet" and
"Unsaved comments" dialogs to enable spacebar for discard and
enter for save.

Bug: 13363
Change-Id: I576b02c4e3f0964aef56a0f1c06ed57c6ba683bf
Reviewed-on: https://code.wireshark.org/review/20485
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>

bgp: Avoid divide by zero

Bug: 13476
Change-Id: I399df46c9d5f6d0d464ecc9cf8d44eddf709f7dc
Reviewed-on: https://code.wireshark.org/review/20499
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>

netlink: support legacy dump request messages

Some legacy tools, including iproute2 < 3.9, issue shorter RTM_GETLINK
and RTM_GETADDR dump queries which only contain struct rtgenmsg rather
than struct ifinfomsg. As noted in kernel comment in rtnl_dump_ifinfo(),
these legacy requests will be (even with attributes) always shorter than
struct ifinfomsg so that they are easy to detect.

Similar problem can be observed with tools using nl_rtgen_request()
function from libnl3; this also affects other RTM_GET* types.

If such legacy message is detected by length shorter than expected data
structure, parse it as this legacy version with (1-byte) struct
rtgenmsg so that it's shown as intended rather than as malformed.

Change-Id: I53b6bff9e44cd2359d7cd313b6f0724f63f0e74d
Reviewed-on: https://code.wireshark.org/review/20461
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michal Kubeček <mkubecek@suse.cz>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

sharkd: support for export objects, following stream.

Change-Id: I364cb200e537ae07cbe831d8be1f217c5a15ee09
Reviewed-on: https://code.wireshark.org/review/20492
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

Updated Address Family Numbers with latest (Last Updated 2016-08-26) IANA table.

Change-Id: I4286a249ca9603732f06e2715c1804a201c105e9
Reviewed-on: https://code.wireshark.org/review/20489
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

T30: fix parsing broken since ge063924

Bug: 1918
Change-Id: I276e5ad74caaf509d220f97e111d2aedc7caef17
Reviewed-on: https://code.wireshark.org/review/20423
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>

unistim (plugin): fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7

Change-Id: Id928c9f4506b3f88016d77e3e79a4ecf78d52e93
Reviewed-on: https://code.wireshark.org/review/20494
Reviewed-by: Michael Mann <mmann78@netscape.net>

oids: fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7

Change-Id: I8f84414be693ea8ebcfef003480e9ee05de94ea0
Reviewed-on: https://code.wireshark.org/review/20495
Reviewed-by: Michael Mann <mmann78@netscape.net>

stats_tree: fix this statement may fall through [-Werror=implicit-fallthrough] found by gcc7

Change-Id: Idd5ab938b95d515cdf8b2a8568456f44b3dd85ac
Reviewed-on: https://code.wireshark.org/review/20496
Reviewed-by: Michael Mann <mmann78@netscape.net>

BGP: Fix the issue that SAFI 72 (BGP-LS-VPN) was not decoded.

Change-Id: I2aef41458c89975dddea4d8bb6355bb7aabd1cad
Reviewed-on: https://code.wireshark.org/review/20488
Reviewed-by: Anders Broman <a.broman58@gmail.com>

[LDAP] Add a couple of OID translations.

Change-Id: I3d3435a9ac5d2a177b0ced6085eabe4feb67ba7b
Reviewed-on: https://code.wireshark.org/review/20484
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>

Add decoding of EDCA IE

Bug: 13472
Change-Id: Iff8b3e532680ada668581263476b6557518acc50
Reviewed-on: https://code.wireshark.org/review/20486
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

SMB3 SVHDX_OPEN_DEVICE_CONTEXT_V2 implementation

1. Extended SMB3 dissector of OPEN_DEVICE_CONTEXT to hanlde V2 structure
See https://msdn.microsoft.com/en-us/library/mt240852.aspx

2. Rejected restriction for request-only processing
(now this context MUST be handled in response packets too, both V1 and v2).
See https://msdn.microsoft.com/en-us/library/dn366831.aspx
and https://msdn.microsoft.com/en-us/library/dn409028.aspx#Appendix_A_10

Change-Id: I7f200932d07eb61c6465d5792a550332ac769be5
Reviewed-on: https://code.wireshark.org/review/20473
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>

Don't cast to a too-large size.

The maximum record length is 255*128 + 127 = 32767; that fits in a
guint32, which is large enough to support the biggest packet we'd ever
support without stretching several size values to 64 bits.

It's not a size of an object in memory, so it doesn't have to be a
size_t, and a size_t could be too large to fit in the record sizes we're
using.

Just cast to guint32.

Change-Id: Ie664fda3ce9945893fd992bbb9a81a5d632a3fcb
Reviewed-on: https://code.wireshark.org/review/20479
Reviewed-by: Guy Harris <guy@alum.mit.edu>

Replace aes.c and des.c by Libgcrypt

Follow-up of https://code.wireshark.org/review/20095

Rewritten functions:
- crypt_des_ecb

crypt_des_ecb verified against previous crypt_des_ecb implementation with
4294967295 random keys and input buffers from /dev/random as I cannot find a
suitable pcap which uses DES

Change-Id: I21ec2572451e0ded4299ffadd8dd687817bc6318
Reviewed-on: https://code.wireshark.org/review/20429
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

io_graph_item: fix false positive array subscript is above array bounds [-Werror=array-bounds]

Change-Id: I14fc19f131782a9c85104ca2189b9452079d0013
Reviewed-on: https://code.wireshark.org/review/20454
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

nstrace: fix size of vmnames

When vmnames are included in the header of a netscaler packet trace,
number of bytes equal to the size of vmnames is omitted from the packet,
by the dissector.

Bug: 13459
Change-Id: I0f907e9c2e08c1cbebd47f7e50d8284a6aaade59
Reviewed-on: https://code.wireshark.org/review/20446
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>

TLS: append Log name for CT Log IDs

Show something like "Signed Certificate Timestamp (Google 'Pilot' Log)"
if the Log ID is recognized, or "... (Unknown Log)" otherwise.

Bug: 13372
Change-Id: I1cd373f110d5beb63ee89fb85831ab72cafe03d0
Reviewed-on: https://code.wireshark.org/review/20387
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

ftypes: move set_value_protocol into the union

Delete set_value_protocol from struct _ftype_t, make it part of the
set_value union.

Change-Id: Iae55388b8a2c965944028499619282c3232c31f3
Reviewed-on: https://code.wireshark.org/review/20475
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

ftypes: move set_value_string into the union

Delete set_value_string from struct _ftype_t, make it part of the
set_value union.

Change-Id: Ia3a57245330ed0d158c8c3e4552ec5d80752fe0f
Reviewed-on: https://code.wireshark.org/review/20474
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

RTP streams dialog: Fix find reverse button

Fix find reverse button

Bug: 13462
Change-Id: I6e19fa38cd333285c9ca3cf01e4c06ff8de56b2a
Reviewed-on: https://code.wireshark.org/review/20462
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

ftypes: move set_value_time into the union

Delete set_value_time from struct _ftype_t, make it part of the
set_value union.

Change-Id: Ieee3b083d52afdd608e31e8ca75b50016fec8a69
Reviewed-on: https://code.wireshark.org/review/20442
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: Peter Wu <peter@lekensteyn.nl>

IEEE80211: Support of MU Exclusive Beamforming Report decoding under VHT Compressed Beamforming.

Bug: 13343
Change-Id: Ia69b2c074adb1c269c93db40ad5004a261560c88
Reviewed-on: https://code.wireshark.org/review/20224
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>

Add another instance of capture_opts_log when more information is known.

Make a url in a comment more readable.

Change-Id: I9a34e442434cc50c6d631622d680c12049c7dbf8
Reviewed-on: https://code.wireshark.org/review/20472
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

snort-config: fix comparison between pointer and zero character constant [-Werror=pointer-compare]

Change-Id: I6afeac8606fda59c833933628f53d2eb73e2909c
Reviewed-on: https://code.wireshark.org/review/20445
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>

Qt: Fix heap-use-after-free when deleting IO graph

Deleting a IO graph item while editing a field will use the IOGraph
object so ensure we delete in correct order to avoid heap-use-after-free.

Bug: 13234
Change-Id: I6d0de21684f842fbd67c9b38fc6b75b81aec5518
Reviewed-on: https://code.wireshark.org/review/20456
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>

imap: Give correct lineend to get_token_len()

The return value from get_token_len() is the token length, but the
returned next_token can have a offset more than token length because
it also skip trailing blanks. Ensure we always give correct lineend.

Bug: 13466
Change-Id: I88a11b9bce02999fcf87c0d7542e56fa90aae5a0
Reviewed-on: https://code.wireshark.org/review/20451
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>

proto: Check for empty protocol->fields

In proto_get_first_protocol_field() we must check for an empty
protocol->fields because Lua scripts may have protocols without
fields and g_ptr_array_index() does not perform bounds checking
on the given index.

Bug: 13223
Change-Id: Ib2f6286d0799541243450348dcf345a965b2825c
Reviewed-on: https://code.wireshark.org/review/20455
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>

Introduce "bytes_string" type, similar to "value_string"

In order to map arbitrary byte buffers to strings, introduce a new
"bytes_string" type. Since "bytes_to_str" is already used for other
purposes, name the generic function "bytesval_to_str" instead similar to
the name( "val_to_str").

Accept "size_t" as length parameter since this is what is returned by
the "sizeof" operator. Do not add a "try_bytesval_to_str_idx" variant
since this pattern is not needed for now. Add a variant to match the
prefix since this is currently expected by the ISAKMP dissector.

Change-Id: I6d790325e85d9fb1384330f28a8c36e2057fdf30
Reviewed-on: https://code.wireshark.org/review/20386
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: Peter Wu <peter@lekensteyn.nl>

ubertooth: fix this statement may fall through [-Werror=implicit-fallthrough=] found by gcc7

Change-Id: Iec4253ad488f51169ce4cc295b5f084ba4aa4122
Reviewed-on: https://code.wireshark.org/review/20412
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.tomasz.labedzki@gmail.com>

ftypes: move set_value_guid into the union

Delete set_value_guid from struct _ftype_t, make it part of the
set_value union.

Change-Id: I3a04ff6b1ab179063ef77a3c475809df0bde5c68
Reviewed-on: https://code.wireshark.org/review/20441
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

ftypes: move set_value_bytes into the union

Delete set_value_bytes from struct _ftype_t, make it part of the
set_value union.

Change-Id: I3ee6a9f68b269ee083794947816e13ea6c1b9d29
Reviewed-on: https://code.wireshark.org/review/20440
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>

http: Check for valid tcpinfo pointer

In dissect_http_tcp() the data pointer may be NULL so ensure
we check for this before dereferencing it.

Bug: 13457
Change-Id: I84f4a0e3b416a2829998f20fe59da8770a34e564
Reviewed-on: https://code.wireshark.org/review/20438
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>

nsh: remove duplicate ethertype entry

Change-Id: I3b177eb86a4058a437f9fb0617b5ae5b3a513af2
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
Reviewed-on: https://code.wireshark.org/review/20447
Reviewed-by: Anders Broman <a.broman58@gmail.com>