metze/wireshark/wip.git
7 years agoERF: Fix and improve ERF_TYPE_META sanity checks
Anthony Coddington [Thu, 5 May 2016 07:40:57 +0000 (19:40 +1200)]
ERF: Fix and improve ERF_TYPE_META sanity checks

Fix sanity checking overflow in wiretap ERF_TYPE_META parsing segfault.
Fix final tag of exactly 4 bytes not being dissected.
Fix not setting bitfield tag subtree (was working due to proto.c internal behaviour).
Add dissector expertinfo for truncated tags. Dissect type and length on error.

Bug: 12352
Change-Id: I3fe6644f369e4d6f1f64270cb83c8d0f8a1f1a94
Reviewed-on: https://code.wireshark.org/review/15357
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoStart dissecting the Mikrotik/Routerboard vendorspecific IEs
Joerg Mayer [Sun, 22 May 2016 10:54:24 +0000 (12:54 +0200)]
Start dissecting the Mikrotik/Routerboard vendorspecific IEs

Change-Id: I87c80489c77243191cd44ab8fc6172a884ec05fb
Reviewed-on: https://code.wireshark.org/review/15526
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
7 years agospeex: Fix unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas]
João Valverde [Sun, 22 May 2016 02:26:52 +0000 (03:26 +0100)]
speex: Fix unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas]

Change-Id: Ia6c5d2c19d991ee3ca3b1525b93121ee7cf15b1e
Reviewed-on: https://code.wireshark.org/review/13919
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>
7 years agoMake -Wunused-const-variable a C only warning
João Valverde [Sun, 22 May 2016 03:56:48 +0000 (04:56 +0100)]
Make -Wunused-const-variable a C only warning

Change-Id: If93de2c371f36fa0447fb8215337f0c115d74bbb
Reviewed-on: https://code.wireshark.org/review/15524
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoRevert "tango_color(.h): avoid ‘tango_butter_3’ defined but not used [-Werror=unused...
João Valverde [Sun, 22 May 2016 03:55:19 +0000 (04:55 +0100)]
Revert "tango_color(.h): avoid ‘tango_butter_3’ defined but not used [-Werror=unused-const-variable] found by gcc6"

This reverts commit 5dbc727ae9c1ceebdaafab29eff89e487c9e824a.

Change-Id: I71ad6a1468c10d515f73ee25a92fb1e35a995dc6
Reviewed-on: https://code.wireshark.org/review/15523
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoReapply "ws80211: Disable shorten-64-to-32."
João Valverde [Sun, 22 May 2016 02:43:29 +0000 (03:43 +0100)]
Reapply "ws80211: Disable shorten-64-to-32."

Disable shorten-64-to-32 in ws80211_create_on_demand_interface,
which calls NLA_PUT_STRING, which passes the output of strlen to an
int parameter. NLA_PUT_STRING is defined in netlink/attr.h so there's
not much we can do to fix it directly.

By Gerald in b8f90de70efa2d271274fbb48df12737f6eddd12.

Change-Id: Ifb92244423fcb2cc267f8fcefb7a2700a7b7c0ea
Reviewed-on: https://code.wireshark.org/review/15522
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoAdd clang-specific DIAG_OFF pragma
João Valverde [Sun, 22 May 2016 02:24:56 +0000 (03:24 +0100)]
Add clang-specific DIAG_OFF pragma

Change-Id: I7e02ca86122e3fe8a1c2db9d53b718e6e23c4e98
Reviewed-on: https://code.wireshark.org/review/15521
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoRevert "ws80211: Disable shorten-64-to-32."
João Valverde [Sun, 22 May 2016 02:37:14 +0000 (03:37 +0100)]
Revert "ws80211: Disable shorten-64-to-32."

This reverts commit b8f90de70efa2d271274fbb48df12737f6eddd12.

Change-Id: Ic7eaf288d1937a986c2ec85ba43a94ac20b6e12e
Reviewed-on: https://code.wireshark.org/review/15520
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoconfigure.ac: Capitalize PACKAGE_NAME as "Wireshark"
João Valverde [Sun, 22 May 2016 00:38:08 +0000 (01:38 +0100)]
configure.ac: Capitalize PACKAGE_NAME as "Wireshark"

PACKAGE_TARNAME is still "wireshark" (generated by autoconf).

Change-Id: I93b69c5b29241a78fbabf35e80e6d2dee53ea3ae
Reviewed-on: https://code.wireshark.org/review/15516
Reviewed-by: João Valverde <j@v6e.pt>
7 years ago[skinny] Fix StartMediaTransmissionMessage and OpenReceiveChannelMessage protocol...
Diederik de Groot [Sat, 21 May 2016 09:54:19 +0000 (11:54 +0200)]
[skinny] Fix StartMediaTransmissionMessage and OpenReceiveChannelMessage protocol version 20

- StartMediaTransmissionMessage is variable length
- latentCapsInfo moved to protocol version 21-22

Change-Id: I4136c7007a8f9d6a8a3370d45faab62bbe983524
Reviewed-on: https://code.wireshark.org/review/15512
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agowtap_opttypes: fix no previous prototype for function 'wtap_opttype_write_data_uint64...
Alexis La Goutte [Sat, 21 May 2016 18:11:33 +0000 (20:11 +0200)]
wtap_opttypes: fix no previous prototype for function 'wtap_opttype_write_data_uint64_timestamp' [-Wmissing-prototypes]

Change-Id: I36244dee9cd5667d498ab0a4ba98b83e8fe84ac8
Reviewed-on: https://code.wireshark.org/review/15514
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoAdd mentioning of support of Server 2012 R2 in the users guide
Jaap Keuter [Sat, 21 May 2016 08:07:59 +0000 (10:07 +0200)]
Add mentioning of support of Server 2012 R2 in the users guide

Bug: 12455
Change-Id: I1c1fc4b2bff0e446d3eb8e1b3be4ea7669cec923
Reviewed-on: https://code.wireshark.org/review/15511
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoBluetooth: BTLE: Add 4.2 LE CONTROLLER COMMANDS
Jakub Pawlowski [Thu, 19 May 2016 16:17:34 +0000 (09:17 -0700)]
Bluetooth: BTLE: Add 4.2 LE CONTROLLER COMMANDS

Change-Id: I5b13291beb0c04e725edb2fe172c39e09cbbefe3
Reviewed-on: https://code.wireshark.org/review/15503
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
7 years agoAdd ability to add custom block types.
Michael Mann [Wed, 18 May 2016 02:50:51 +0000 (22:50 -0400)]
Add ability to add custom block types.

Change-Id: I2d23148c6f8d847aacec1d25cb694793ec9bb84e
Reviewed-on: https://code.wireshark.org/review/15504
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoconfigure.ac: Fix yacc/lex test for out-of-tree build
João Valverde [Fri, 20 May 2016 18:12:10 +0000 (19:12 +0100)]
configure.ac: Fix yacc/lex test for out-of-tree build

Minor cleanup, remove old comment and make both tests identical.

Change-Id: I21aaf2bb7e74878013153534f758879879d23f6e
Reviewed-on: https://code.wireshark.org/review/15509
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>
7 years agoCisco WIDS wlan frames as sent by standalone APs do not include the QoS control
Joerg Mayer [Fri, 20 May 2016 04:05:47 +0000 (06:05 +0200)]
Cisco WIDS wlan frames as sent by standalone APs do not include the QoS control
stuff.

Bug: 12421
Change-Id: Idc56bd573b72465e36c8141d3c0736b286ff220a
Reviewed-on: https://code.wireshark.org/review/15448
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: Jörg Mayer <jmayer@loplof.de>
7 years agoAdd CiscoSystems, vendor id 9 AVPs
AndersBroman [Fri, 20 May 2016 10:45:47 +0000 (12:45 +0200)]
Add CiscoSystems, vendor id 9 AVPs

Bug 12459
Change-Id: I9ebe7f4a9e6ae03539bd74e535c95c85a8efa55b
Reviewed-on: https://code.wireshark.org/review/15506
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
7 years agoQUIC: Enhance Connection Close error check
Alexis La Goutte [Tue, 17 May 2016 17:32:31 +0000 (19:32 +0200)]
QUIC: Enhance Connection Close error check

There is some false positive (and get display malformed frame)
May be add also a check about error_code (< QUIC_LAST_ERROR) ?

Change-Id: Ib7df622d62f1441193fa4b2475220f08a62c9462
Reviewed-on: https://code.wireshark.org/review/15478
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoBluetooth: GATT: Add support for PLXS/PLXP
Michal Labedzki [Sun, 10 Jan 2016 18:00:36 +0000 (19:00 +0100)]
Bluetooth: GATT: Add support for PLXS/PLXP

PLXS is Pulse Oximeter Service used by some pulse oximetry sensor
for consumer and professional healthcare
applications.

Change-Id: Iab5b7dd3e4bfb58cef0cc2c76df1e3aab69f35c7
Reviewed-on: https://code.wireshark.org/review/15452
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
7 years agoQt/Bluetooth: Allow to use Enter button for jump to frames
Michal Labedzki [Mon, 18 Apr 2016 17:31:17 +0000 (19:31 +0200)]
Qt/Bluetooth: Allow to use Enter button for jump to frames

Implement keyPressEvent and do nothing... However it "takes focus"
from button box and jump to frame that some items in tree widget point.

Change-Id: Ib08f1588f20bce66fa945bf952770600c625233c
Reviewed-on: https://code.wireshark.org/review/15455
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>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
7 years agoQt: Add a bottom border to the packet map.
Gerald Combs [Thu, 12 May 2016 00:31:15 +0000 (17:31 -0700)]
Qt: Add a bottom border to the packet map.

Draw a bottom border so it looks a bit less odd on OS X. This could use
some further tweaking.

Change-Id: Id76d0a0cece672b927d6217c7a9f970c1ba212bc
Reviewed-on: https://code.wireshark.org/review/15391
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: Jaap Keuter <jaap.keuter@xs4all.nl>
7 years agoPCEP: fix L bit mask for PATH-KEY sub-object
Francesco Fondelli [Thu, 19 May 2016 14:22:05 +0000 (16:22 +0200)]
PCEP: fix L bit mask for PATH-KEY sub-object

Change-Id: I93ca3e64af2a9f29109a3dc6fb42907562c27321
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/15502
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>
7 years agoconfigure.ac: Don't require flex unless we need it
João Valverde [Sat, 14 May 2016 04:38:27 +0000 (05:38 +0100)]
configure.ac: Don't require flex unless we need it

We need it when we don't have the flex-generated files (i.e., we're
building from git rather than a ("make dist") source tarball).

Change-Id: I824ce4b7f2a8f767e096de050cb3cd0b0449ed62
Reviewed-on: https://code.wireshark.org/review/15423
Reviewed-by: João Valverde <j@v6e.pt>
7 years agodocs: Update Show Packet Bytes docs
Stig Bjørlykke [Thu, 19 May 2016 12:53:15 +0000 (14:53 +0200)]
docs: Update Show Packet Bytes docs

Change-Id: Ib64be403d4c684079f1b15d66ac52566e5ff37d0
Reviewed-on: https://code.wireshark.org/review/15501
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
7 years agoQt: Add Decode as Quoted-Printable in Show Packet Bytes
Stig Bjørlykke [Thu, 19 May 2016 10:09:33 +0000 (12:09 +0200)]
Qt: Add Decode as Quoted-Printable in Show Packet Bytes

Change-Id: I4697b979702e4df83b1ec85b9a3619409c0b366c
Reviewed-on: https://code.wireshark.org/review/15500
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
7 years agoZigBee: implemented Green Power ZCL cluster dissector.
dsrsupport [Wed, 11 May 2016 08:52:51 +0000 (11:52 +0300)]
ZigBee: implemented Green Power ZCL cluster dissector.

Implemented basic Green Power ZCL cluster support and parsing of some GP cluster commands.
Implemented following commands parsing:
GP_NOTIFICATION
GP_COMMISSIONING_NOTIFICATION
GP_PAIRING
GP_PROXY_COMMISSIONING_MODE
GP_RESPONSE
That is enough for Green Power Basic Proxy commissioning.

Change-Id: Icbe00667a6dfb89346288843ce8fa20d62b822dc
Reviewed-on: https://code.wireshark.org/review/15363
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>
7 years agoBabel: New Message String Values
0xbismarck [Thu, 19 May 2016 03:43:19 +0000 (05:43 +0200)]
Babel: New Message String Values

Added new message string values based on the information in rfc7557.

Change-Id: I925b8c82433a6ad809eaec5d235eb42f703e3632
Reviewed-on: https://code.wireshark.org/review/15499
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>
7 years agoAdd missing #include <algorithm> for std::sort()
Michal Labedzki [Fri, 29 Apr 2016 01:39:10 +0000 (03:39 +0200)]
Add missing #include <algorithm> for std::sort()

Definition of std:sort() is in <algorithm> header. Include it to
make Wireshark buildable again.

Change-Id: Ice68013b0e06461faab1f4f0296e26b426ff92a1
Reviewed-on: https://code.wireshark.org/review/15456
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
7 years agoautotools: Add automake silent rule for ln -s
João Valverde [Mon, 16 May 2016 19:33:13 +0000 (20:33 +0100)]
autotools: Add automake silent rule for ln -s

Change-Id: Ic5b6fca04955384dc3d337ec74757f711216a372
Reviewed-on: https://code.wireshark.org/review/15468
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
7 years agoGRE: add support for ARP
Pascal Quantin [Wed, 18 May 2016 20:55:26 +0000 (22:55 +0200)]
GRE: add support for ARP

Protocol type 0x0806 is registered for ARP according to RFC 1701

Bug: 12456
Change-Id: Iccdf582b16c54817a977b87be9f2b03c2f650d2a
Reviewed-on: https://code.wireshark.org/review/15498
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoDNS: Update edns-tcp-keepalive EDNS0 Option to final rfc (RFC7828)
Alexis La Goutte [Wed, 20 Apr 2016 12:43:52 +0000 (14:43 +0200)]
DNS: Update edns-tcp-keepalive EDNS0 Option to final rfc (RFC7828)

Change-Id: I34d6fc5a59af7cfd39a1181e71788dfee617cc22
Reviewed-on: https://code.wireshark.org/review/15497
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
7 years agoQUIC: Enhance RREJ tag dissection
Alexis La Goutte [Tue, 17 May 2016 19:03:53 +0000 (21:03 +0200)]
QUIC: Enhance RREJ tag dissection

it is possible to have multiple reason on same tag
display the handshake failure reason (from crypto_handshake.h)

Change-Id: Ib388d3849292de00fa3d569936a20433bd2a0e89
Reviewed-on: https://code.wireshark.org/review/15479
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: Jeff Morriss <jeff.morriss.ws@gmail.com>
7 years agoQUIC: Update some field name on ACK Frame
Alexis La Goutte [Tue, 17 May 2016 06:11:16 +0000 (08:11 +0200)]
QUIC: Update some field name on ACK Frame

Change coming with draft-02

Change-Id: I361ebcf1cdcbe8da30f1bf3e6ec0ae72f4756be2
Reviewed-on: https://code.wireshark.org/review/15476
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: Jeff Morriss <jeff.morriss.ws@gmail.com>
7 years agoDNS: Fix typo on Padding EDNS0 description
Alexis La Goutte [Wed, 20 Apr 2016 12:43:52 +0000 (14:43 +0200)]
DNS: Fix typo on Padding EDNS0 description

Also update comment about RFC7830

Issue reported by Alex Mayrhofer

Ping-bug:11759
Change-Id: I4e70a32ddca6de43cb97f921b027e167170bf16d
Reviewed-on: https://code.wireshark.org/review/15017
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
7 years agoBGP : Add Virtual-Network Identifier Extended Community
Alexis La Goutte [Wed, 30 Sep 2015 11:09:43 +0000 (13:09 +0200)]
BGP : Add Virtual-Network Identifier Extended Community

From draft-drao-bgp-l3vpn-virtual-network-overlays

Change-Id: I0a0137b6a8b8fbb4b4efd6f5e08eba5ed6d7a9d6
Reviewed-on: https://code.wireshark.org/review/15477
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>
7 years ago[E212] Add an MNC used in test networks to get correct MNC length.
AndersBroman [Wed, 18 May 2016 12:55:04 +0000 (14:55 +0200)]
[E212] Add an MNC used in test networks to get correct MNC length.

Change-Id: I289898207ae5c5b38e4567399b7e0f3b0b48aa9b
Reviewed-on: https://code.wireshark.org/review/15495
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoUse some FT_BYTE "BASE"s in isis dissectors.
Michael Mann [Tue, 1 Dec 2015 02:50:59 +0000 (21:50 -0500)]
Use some FT_BYTE "BASE"s in isis dissectors.

Change-Id: I59acb37250f6248e985482e4b972250e295fd638
Reviewed-on: https://code.wireshark.org/review/15469
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoUSB: check length before calling setup response subdissector
Sean O. Stalley [Wed, 11 May 2016 17:44:41 +0000 (10:44 -0700)]
USB: check length before calling setup response subdissector

If a standard setup response arrives without data, don't call a subdissector.
This can happen if a control endpoint STALLs.
This patch prevents the STALL response from appearing as a malformed packet.

Change-Id: I6f0e82487fae964e93a4291ccb3badbe652f7499
Reviewed-on: https://code.wireshark.org/review/15379
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>
7 years agoandroiddump: Add model name to user-friendly interface name
Michal Labedzki [Fri, 8 Apr 2016 09:49:36 +0000 (11:49 +0200)]
androiddump: Add model name to user-friendly interface name

This can speed up searching for interface specified to model of Android
device - in most cases it is its market name.

Change-Id: Ib5a3b96d9a2a8cf325f62614d395508b4ec58199
Reviewed-on: https://code.wireshark.org/review/15454
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
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>
7 years agoReplace some tvb_get_ptr calls.
Michael Mann [Tue, 17 May 2016 02:21:39 +0000 (22:21 -0400)]
Replace some tvb_get_ptr calls.

Change-Id: I640fd7c96c421bb7862021405cdb7a2c255ced21
Reviewed-on: https://code.wireshark.org/review/15473
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQt: Add accessible names to main welcome widgets.
Gerald Combs [Thu, 12 May 2016 00:55:46 +0000 (17:55 -0700)]
Qt: Add accessible names to main welcome widgets.

Make sure all of the widgets in the main welcome tab loop have their
AccessibleName properties set.

Set AccessibleTextRole for each of the items in the recent file list and
in the interface list.

Ping-Bug: 9284
Change-Id: I247ce7ed68eda82a27a34d98a4bab1bcbed760b5
Reviewed-on: https://code.wireshark.org/review/15405
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>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoQt: make RTP stream analysis columns sortable
Pascal Quantin [Tue, 17 May 2016 21:09:39 +0000 (23:09 +0200)]
Qt: make RTP stream analysis columns sortable

While we are at it, let's sort the rows in ascending order also in
RTP stream dialog

Bug: 12405
Change-Id: Icf96fa071d5d49bcd1c3673c2a5e55b51b359eaa
Reviewed-on: https://code.wireshark.org/review/15493
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>
7 years agolbm (CID 1201450): result of shift operation is always 0
Martin Kaiser [Tue, 17 May 2016 20:44:47 +0000 (22:44 +0200)]
lbm (CID 1201450): result of shift operation is always 0

apply a mask to get the lower 32 bit of a guint64
(there's no need for a right shift)

Change-Id: Ibcf685f6e58a5c5c4b96289d0c08e83d019301e7
Reviewed-on: https://code.wireshark.org/review/15489
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agolbmpdm (CID 1201451): result of shift operation is always 0
Martin Kaiser [Tue, 17 May 2016 20:52:42 +0000 (22:52 +0200)]
lbmpdm (CID 1201451): result of shift operation is always 0

apply a mask to get the lower 32 bit of a guint64
(there's no need for a right shift)

Change-Id: Ifa8281a64bb327bd9b8591cc2e54ee35ab15ae11
Reviewed-on: https://code.wireshark.org/review/15491
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agolbmc (CID 1201452): result of shift operation is always 0
Martin Kaiser [Tue, 17 May 2016 20:48:38 +0000 (22:48 +0200)]
lbmc (CID 1201452): result of shift operation is always 0

apply a mask to get the lower 32 bit of a guint64
(there's no need for a right shift)

Change-Id: Ia8c963dc0dd88f56c4ccaf0c37a1bd3d51d65d27
Reviewed-on: https://code.wireshark.org/review/15490
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoCorrectly write out the isb_startime and isb_endtime options.
Guy Harris [Tue, 17 May 2016 21:04:04 +0000 (14:04 -0700)]
Correctly write out the isb_startime and isb_endtime options.

They're not marshalled as a 64-bit integer in pcapng files, they're
marshelled as 2 32-bit integers, the first of which is the upper 64 bits
of the value and the second of which is the lower 64 bits of the value.

Bug: 12349
Change-Id: I2bde51ac11b2518ef2ddaecf43672c984f26081a
Reviewed-on: https://code.wireshark.org/review/15492
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agomanolito: try to detect the packet type ...
Martin Kaiser [Mon, 16 May 2016 17:54:51 +0000 (19:54 +0200)]
manolito: try to detect the packet type ...

... only if we haven't figured it out yet

Do some other minor cleanup while at it.

Change-Id: I75d10b66a529c2043f17fced3e65f57ada993442
Reviewed-on: https://code.wireshark.org/review/15488
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agomanolito: use a value string for longname
Martin Kaiser [Mon, 16 May 2016 17:44:40 +0000 (19:44 +0200)]
manolito: use a value string for longname

Change-Id: I57bdc87b062c8199bb174f94d301cc96f493da2a
Reviewed-on: https://code.wireshark.org/review/15487
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agomanolito: use tvb_get_string_enc() for the field name
Martin Kaiser [Mon, 16 May 2016 17:28:54 +0000 (19:28 +0200)]
manolito: use tvb_get_string_enc() for the field name

There's no need to build a string by reading byte-by-byte.

Change-Id: I23223ec1188acbd2591817d66cc8f15d4eb25427
Reviewed-on: https://code.wireshark.org/review/15486
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agomanolito: refactor the message parsing
Martin Kaiser [Mon, 16 May 2016 17:21:41 +0000 (19:21 +0200)]
manolito: refactor the message parsing

Use an offset variable, increment it as we walk through the packet. Use
tvb_reported_length_remaining() to see if we have more data.

Change-Id: I7048316ee418ff3e79e391295a29d9b221079847
Reviewed-on: https://code.wireshark.org/review/15485
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agomanolito: remove some pointless comments
Martin Kaiser [Mon, 16 May 2016 17:12:05 +0000 (19:12 +0200)]
manolito: remove some pointless comments

which were copied from doc/packet-PROTOABBREV.c (or its predecessor)

Change-Id: I8f81d45cf7e9ad00378c965af663df8b64a9b591
Reviewed-on: https://code.wireshark.org/review/15484
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agomanolito: skip integer elements that have an invalid length
Martin Kaiser [Mon, 16 May 2016 16:54:52 +0000 (18:54 +0200)]
manolito: skip integer elements that have an invalid length

As we know the field's length, we can skip to the next field even if the
length is invalid. There's no need to abort the dissection in this case.

Change-Id: I855427ca07f38c3041018a2d7ed9dbc15f1e9bd7
Reviewed-on: https://code.wireshark.org/review/15483
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agomanolito: don't use a temporary data pointer
Martin Kaiser [Mon, 16 May 2016 17:09:32 +0000 (19:09 +0200)]
manolito: don't use a temporary data pointer

We either have a string or an integer. Use tvb_get_string_enc() to get
the string.

Change-Id: I84a83aed5eba57817e53bb194a8e01c273abf57a
Reviewed-on: https://code.wireshark.org/review/15482
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agomanolito (CID 1355642): avoid shifting by 32 bits
Martin Kaiser [Mon, 16 May 2016 16:26:37 +0000 (18:26 +0200)]
manolito (CID 1355642): avoid shifting by 32 bits

The result of shifting a 32bit value by 32 bits is undefined.

Avoid all of the shift operations. Use the appropriate functions to get
the value from the tvb.

It seems that a manolito integer can be up to 5 octets. Use data types
large enough to store the possible values.

Change-Id: Icc1b538dbd7cdb27700140e9e5b81458b1047537
Reviewed-on: https://code.wireshark.org/review/15481
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years ago[skinny] Update message definitions
Diederik de Groot [Sat, 14 May 2016 12:05:30 +0000 (14:05 +0200)]
[skinny] Update message definitions

- Deal with short EnblocCallMessage coming from 7936
- SubscriptionStatReqMessage is shorter than previously known
- Use buttonType enum in FeatureStatV2Message and FeatureStatMessage

Change-Id: I0c4db5a0199ebb95bf807c858971d763faeef016
Reviewed-on: https://code.wireshark.org/review/15427
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>
7 years agoopa: Add dissectors for Intel’s Omni-Path Architecture (OPA)
Adam Goldman [Thu, 4 Feb 2016 15:10:28 +0000 (10:10 -0500)]
opa: Add dissectors for Intel’s Omni-Path Architecture (OPA)

Added dissectors for OPA Fabric Executive (FE) Header, OPA Snoop and
Capture (SnC) MetaData Header, OPA 9B Packets, and OPA MAD Packets.

Bug: 12114
Change-Id: I6acd3c9e266e4b638167abbdd275ec7c1d472b4f
Reviewed-on: https://code.wireshark.org/review/13473
Reviewed-by: Adam Goldman <adam.goldman@intel.com>
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: Michael Mann <mmann78@netscape.net>
7 years ago6lowpan - Eliminate tvb_get_ptr
Michael Mann [Tue, 17 May 2016 02:19:30 +0000 (22:19 -0400)]
6lowpan - Eliminate tvb_get_ptr

Change-Id: I6a8ea98cf0f4a2172e73fc4dcad67f2dbf8d5be3
Reviewed-on: https://code.wireshark.org/review/15471
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoReplace tvb_get_ptr with tvb_memdup.
Michael Mann [Tue, 17 May 2016 02:17:33 +0000 (22:17 -0400)]
Replace tvb_get_ptr with tvb_memdup.

The number of bytes allocated is small enough not to matter.

Change-Id: I44c2103a87bd41f21e61d0f27648266fdc2be557
Reviewed-on: https://code.wireshark.org/review/15470
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQt: Delete recent items.
Gerald Combs [Tue, 17 May 2016 04:12:57 +0000 (13:12 +0900)]
Qt: Delete recent items.

QListWidget::takeItem removes an item from the list but doesn't free it.
Call delete instead.

Change-Id: I81b1315d0851518935f542c53455b283e26e5dc5
Reviewed-on: https://code.wireshark.org/review/15474
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>
7 years agotvb_get_ptr + wmem_alloc = tvb_memdup
Michael Mann [Tue, 17 May 2016 02:20:52 +0000 (22:20 -0400)]
tvb_get_ptr + wmem_alloc = tvb_memdup

Change-Id: Iee33c59d5b032f3c99ba16338195c050e8078329
Reviewed-on: https://code.wireshark.org/review/15472
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoQUIC: Add new public flags (Diversification nonce and Multipath)
Alexis La Goutte [Mon, 16 May 2016 16:45:34 +0000 (18:45 +0200)]
QUIC: Add new public flags (Diversification nonce and Multipath)

Add dissection of Diversification nonce (if QUIC Version >= 33)

Bug:11494
Change-Id: I448921db30174e47c30b3f60656ec3494f079c23
Reviewed-on: https://code.wireshark.org/review/15465
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQUIC: Update QUIC Error message list
Alexis La Goutte [Mon, 16 May 2016 17:28:19 +0000 (19:28 +0200)]
QUIC: Update QUIC Error message list

Change-Id: I9a33c37658b48cf47d4f054658ac42fab99d7a43
Reviewed-on: https://code.wireshark.org/review/15466
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>
7 years agoEnhance error printout if register_dissector_table() is called with wrong
AndersBroman [Mon, 16 May 2016 11:39:01 +0000 (13:39 +0200)]
Enhance error printout if register_dissector_table() is called with wrong
type.

Change-Id: I7af0d89441b9ab87e9ed8dd0d52ca7f6ad82b896
Reviewed-on: https://code.wireshark.org/review/15458
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoUse a native Section Header block for capinfo.
Michael Mann [Thu, 3 Mar 2016 22:27:30 +0000 (17:27 -0500)]
Use a native Section Header block for capinfo.

This is intended to aid possible future efforts with generic
block handling.

Change-Id: Iff915a8d0d8ed20ef89c20e0cf7967a3416318c3
Reviewed-on: https://code.wireshark.org/review/15451
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoUse the new ETHERTYPE_QINQ_OLD #define.
Guy Harris [Mon, 16 May 2016 18:24:53 +0000 (11:24 -0700)]
Use the new ETHERTYPE_QINQ_OLD #define.

Change-Id: Ifaf96e8482316720bddc5bab3aab3d0a677fe5fb
Reviewed-on: https://code.wireshark.org/review/15464
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoethertype: Add old non-standard 802.1ad (QinQ)
Alexis La Goutte [Mon, 16 May 2016 14:26:34 +0000 (16:26 +0200)]
ethertype: Add old non-standard 802.1ad (QinQ)

Issue reported by boaz
Bug:12441
Change-Id: I1feb82615db65b0806c56425dd9f3cffdde463b4
Reviewed-on: https://code.wireshark.org/review/15461
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoethertype: fix indent (use tabs) and modelines info
Alexis La Goutte [Mon, 16 May 2016 14:22:41 +0000 (16:22 +0200)]
ethertype: fix indent (use tabs) and modelines info

Change-Id: I78253c35c84fed2e3f2775aa96798e29ae3b7bc3
Reviewed-on: https://code.wireshark.org/review/15460
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoconfigure.ac: Don't require yacc unless it is required
João Valverde [Mon, 2 May 2016 23:28:42 +0000 (00:28 +0100)]
configure.ac: Don't require yacc unless it is required

Change-Id: I5e639d867c95eb6f476d5be72e52457a9cc89437
Reviewed-on: https://code.wireshark.org/review/15247
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>
7 years agoautotools: Check for SpeexDSP system library
João Valverde [Tue, 10 May 2016 18:25:38 +0000 (19:25 +0100)]
autotools: Check for SpeexDSP system library

Change-Id: Ie07f49ec5a563f3b43a2442e05646c6a0b51ca41
Reviewed-on: https://code.wireshark.org/review/15349
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>
7 years agoQUIC: Sequence (Number) is rename to Packet Number
Alexis La Goutte [Sun, 15 May 2016 17:58:56 +0000 (19:58 +0200)]
QUIC: Sequence (Number) is rename to Packet Number

Change-Id: Iaa516108996e5087042c49ca3e076a6cc6b59eea
Reviewed-on: https://code.wireshark.org/review/15440
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>
7 years ago[SIP] Remove expert info for Contact with expires=0, it's used in 3GPP SIP
AndersBroman [Mon, 16 May 2016 11:29:45 +0000 (13:29 +0200)]
[SIP] Remove expert info for Contact with expires=0, it's used in 3GPP SIP
calls.

Change-Id: I23a013519f4a7f2c0a81f84a40045dd13c8b67f7
Reviewed-on: https://code.wireshark.org/review/15457
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoISUP: fix buffer overrun when a number contains too many digits (CID 1361601)
Pascal Quantin [Sun, 15 May 2016 19:29:44 +0000 (21:29 +0200)]
ISUP: fix buffer overrun when a number contains too many digits (CID 1361601)

Check the current length before adding the digit and not after
While we are at it, also switch to strbuf wmem buffer instead

Bug: 12442
Change-Id: If3e80e8446f527fe8fb013fbd57828f5572ca5ee
Reviewed-on: https://code.wireshark.org/review/15441
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoCreate option flag field for dissect_ieee80211_common.
Michael Mann [Sun, 15 May 2016 23:05:45 +0000 (19:05 -0400)]
Create option flag field for dissect_ieee80211_common.

This allows for better expandability of future options
(and not having to add more boolean parameters or remove
obsolete ones)

Change-Id: I761bcfdbffe5b15c71dcd2a500e467b0f2c7a2fa
Reviewed-on: https://code.wireshark.org/review/15450
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQUIC: Fix heuristic to detect Connection Close
Alexis La Goutte [Sun, 15 May 2016 16:54:45 +0000 (18:54 +0200)]
QUIC: Fix heuristic to detect Connection Close

Change-Id: Ib43401fdd92e119d69c9c7b9dee365ea21658d2d
Reviewed-on: https://code.wireshark.org/review/15437
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQUIC: Add Version Negotiation dissection
Alexis La Goutte [Sun, 15 May 2016 17:37:57 +0000 (19:37 +0200)]
QUIC: Add Version Negotiation dissection

Ping-Bug:11494
Change-Id: I3f0999049cd47f70154fdfbd3ca618c413dbea87
Reviewed-on: https://code.wireshark.org/review/15439
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQUIC: Rename some function
Alexis La Goutte [Sun, 15 May 2016 17:11:49 +0000 (19:11 +0200)]
QUIC: Rename some function

We don't only try and dissector only handshake

Change-Id: I92576cb7a6d8d3390d4a95d8e81db06d8698a77c
Reviewed-on: https://code.wireshark.org/review/15438
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agotshark: fix double memory free when analyzing several RTP streams
Pascal Quantin [Sun, 15 May 2016 16:24:34 +0000 (18:24 +0200)]
tshark: fix double memory free when analyzing several RTP streams

Bug: 12430
Change-Id: I4f77aee4102edb9d5d8d450de962ca1f4b33bb71
Reviewed-on: https://code.wireshark.org/review/15434
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>
7 years agoISUP: Fix no previous prototype for function 'dissect_isup_digits_common' [-Wmissing...
Alexis La Goutte [Sun, 15 May 2016 15:16:29 +0000 (17:16 +0200)]
ISUP: Fix no previous prototype for function 'dissect_isup_digits_common' [-Wmissing-prototypes]

Fix also indent typo (replace tabs by spaces)

Change-Id: Ibb124c4fc7f175f0dd77331a25df30974bf71ec6
Reviewed-on: https://code.wireshark.org/review/15431
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoExport PDU (ui): fix no newline at end of file [-Wnewline-eof] and modelines info
Alexis La Goutte [Sun, 15 May 2016 15:18:27 +0000 (17:18 +0200)]
Export PDU (ui): fix no newline at end of file [-Wnewline-eof] and modelines info

Change-Id: I23bdedb52fd01494f49eef06fee52df317ef1251
Reviewed-on: https://code.wireshark.org/review/15432
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>
7 years ago[Automatic update for 2016-05-15]
Gerald Combs [Sun, 15 May 2016 15:10:23 +0000 (08:10 -0700)]
[Automatic update for 2016-05-15]

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

Change-Id: I877a3018c81dc557453bf1e423c84578da47d74b
Reviewed-on: https://code.wireshark.org/review/15429
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoGUI: Add shortcut for packet and capture comment
Uli Heilmeier [Mon, 9 May 2016 05:14:38 +0000 (07:14 +0200)]
GUI: Add shortcut for packet and capture comment

Added "Ctrl+Alt+C" as shortcut for packet comment.
Added "Ctrl+Alt+Shift+C" as shortcut for capture comment (GTK)
resp. for Capture File Properties (QT)

Bug: 12410
Change-Id: I1ba61a38829c35f3bb166a94cda4bec3901c7ef1
Reviewed-on: https://code.wireshark.org/review/15300
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agopcap-common: Account for padding in ENCAP_ERF len and caplen
Anthony Coddington [Mon, 18 Apr 2016 01:44:35 +0000 (13:44 +1200)]
pcap-common: Account for padding in ENCAP_ERF len and caplen

Set len and caplen in pcap_read_post_process to actual wlen/payload length like for native ERF.
This fixes padding incorrectly showing as an Ethernet trailer or equivalent as
well as packet length calculations being incorrect.

Fix up rlen when writing ENCAP_ERF so it isn't longer than the actual record
length. This differs from native ERF behaviour which pads the record instead
but there is currently no non-hackish way to do this for pcap/pcap-ng.

Note: This means records captured from a DAG card in Wireshark (or old
PCAP(-NG) files opened) will have padding stripped when saved as PCAP(-NG) and
thus cannot be transmitted when converted to native ERF without aligning first.
However, if the file is saved as native ERF originally the padding will be
preserved (and zeroed). Given that extension header write support was very
broken and transmission of PCAP(-NG) is not supported without conversion this
is not expected to have been common.

Ping-Bug: 3606
Change-Id: I49dce03984d7f07431b6eb7e16a993aeb571f288
Reviewed-on: https://code.wireshark.org/review/15359
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoERF: Add dissection of missing ERF types
Anthony Coddington [Thu, 12 May 2016 06:54:01 +0000 (18:54 +1200)]
ERF: Add dissection of missing ERF types

Wiretap support had already been added for old type variants COLOR_HASH_ETH and
COLOR_HASH_POS, dissect them like the other variants.

Change-Id: I60b83c50a258a27c31a498382c276bc4f4a34cbb
Reviewed-on: https://code.wireshark.org/review/15397
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQUIC: Wrong length comparaison
Alexis La Goutte [Fri, 13 May 2016 21:19:19 +0000 (23:19 +0200)]
QUIC: Wrong length comparaison

Change-Id: I6c95e78d1248f8d604903952914d6cfc11432db6
Reviewed-on: https://code.wireshark.org/review/15420
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQUIC: Add Public Reset dissection
Alexis La Goutte [Fri, 13 May 2016 21:14:49 +0000 (23:14 +0200)]
QUIC: Add Public Reset dissection

Ping-Bug:11494
Change-Id: I51f19c2e09f9503fa8a6a34933048bce3fef2803
Reviewed-on: https://code.wireshark.org/review/15419
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agodof: use include "" to include packet-tcp.h
Martin Kaiser [Sat, 14 May 2016 10:04:38 +0000 (12:04 +0200)]
dof: use include "" to include packet-tcp.h

we expect to find packet-tcp.h in the same directory as our dissector

Change-Id: I1bf027afbf810708e9f1428442d41b79708738cd
Reviewed-on: https://code.wireshark.org/review/15426
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agodof (CID 1358547): remove dead code
Martin Kaiser [Sat, 14 May 2016 09:53:48 +0000 (11:53 +0200)]
dof (CID 1358547): remove dead code

ccm_data can't possibly be NULL at this point

Change-Id: I30dcf902573a54e7efed864339f05e98bb666b20
Reviewed-on: https://code.wireshark.org/review/15425
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agomp2t (CID 1355406): fix a potential integer overflow
Martin Kaiser [Tue, 10 May 2016 21:06:57 +0000 (23:06 +0200)]
mp2t (CID 1355406): fix a potential integer overflow

cast one of the factors to uint64 to make sure that the calculation uses
uint64 and not uint32 which may overflow

Change-Id: Iec14f870a694008f5a734294d9154117b6c64b78
Reviewed-on: https://code.wireshark.org/review/15346
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agos7comm: fix warning found by clang analyzer
Thomas Wiens [Fri, 13 May 2016 19:55:42 +0000 (21:55 +0200)]
s7comm: fix warning found by clang analyzer

Fixed warnings about Dead store / Dead assignment found by clang
analyzer.
Fixed encoding to be compatible to hf-type.

Change-Id: Iba93abe21f87029d53cd1db111b372cd4bd76229
Reviewed-on: https://code.wireshark.org/review/15418
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>
7 years agoUse g_get_charset instead of g_get_codeset.
Gerald Combs [Fri, 13 May 2016 16:22:34 +0000 (09:22 -0700)]
Use g_get_charset instead of g_get_codeset.

From Guy via
https://www.wireshark.org/lists/wireshark-dev/201605/msg00027.html

Change-Id: I7884cecb6cd87f474ecc3f84253797fe57f62487
Reviewed-on: https://code.wireshark.org/review/15421
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoQt: Use SpeexDSP API names for RTP player
João Valverde [Thu, 12 May 2016 12:23:27 +0000 (13:23 +0100)]
Qt: Use SpeexDSP API names for RTP player

The speex headers use some CPP magic to rename the API.

Using the public names in the calling code reduces obfuscation and
allows linking with libspeexdsp.so also.

Change-Id: I10c6cd2de6b237400224d3db6a9995e646747311
Reviewed-on: https://code.wireshark.org/review/15400
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoQt: Fix a recent files infinite loop.
Gerald Combs [Fri, 13 May 2016 18:13:07 +0000 (11:13 -0700)]
Qt: Fix a recent files infinite loop.

QListWidget::takeItem does nothing if the row is invalid. This is the
case when we pass it ::count(). Make sure that we remove a valid row and
that our loop will terminate.

Follow-up to g174dc98.

Change-Id: I7e695cc04b2f3b5c28a8cc70af0579d787ff8737
Reviewed-on: https://code.wireshark.org/review/15417
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoFix (spurious) checkAPIs issue
Graham Bloice [Fri, 13 May 2016 17:50:40 +0000 (18:50 +0100)]
Fix (spurious) checkAPIs issue

checkAPIs complains that the system member of the kingfisher_packet_t
structure shadows a system variable.

Althoguh this is a false positive, rename the variable to keep
checkAPIs happy.

Change-Id: Ia356dea5abb3ed93d10c5057f55786e2f28cec11
Reviewed-on: https://code.wireshark.org/review/15414
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
7 years agopacket-nfs: Add flex file flag: FF_FLAGS_NO_READ_IO
Tom Haynes [Fri, 13 May 2016 18:10:45 +0000 (11:10 -0700)]
packet-nfs: Add flex file flag: FF_FLAGS_NO_READ_IO

Change-Id: I3c5895d2e0671cdcd8063aa27356d49aa2bdbfa7
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/15416
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Trond Myklebust <trondmy@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agoRun checkAPIs in epan/wmem/
Michael Mann [Fri, 13 May 2016 15:03:55 +0000 (11:03 -0400)]
Run checkAPIs in epan/wmem/

Was fixed to pass.  Let's keep it that way.

Change-Id: I49b532b6f1df2430b3912f8f1e9d518caff17d2c
Reviewed-on: https://code.wireshark.org/review/15413
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoHave wmem conform to checkAPIs.pl
Michael Mann [Thu, 12 May 2016 17:39:15 +0000 (13:39 -0400)]
Have wmem conform to checkAPIs.pl

Yes, the rename of structure members is a bit hacky.
Yes, catering to Windows since "GLib's v*printf routines are
surprisingly slow on Windows".
But it does pass checkAPIs.pl

Change-Id: I5b1552472c83aa2e159f17b5b7eb70b37d03eff9
Reviewed-on: https://code.wireshark.org/review/15404
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQt: add some cleanup function calls missing when leaving application
Pascal Quantin [Wed, 11 May 2016 13:16:44 +0000 (15:16 +0200)]
Qt: add some cleanup function calls missing when leaving application

Change-Id: I8f22d321e84daa36d4a40856b61d0844d3489cc2
Reviewed-on: https://code.wireshark.org/review/15374
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>
7 years agoBACAPP: event-time-stamps decode fix
Lori Tribble [Fri, 13 May 2016 01:08:35 +0000 (21:08 -0400)]
BACAPP: event-time-stamps decode fix

event-time-stamps decode when array-index is 0.

Bug: 12422
Change-Id: I9f1f90e269352a49a8fc8a2ba2f64211f3cf7961
Reviewed-on: https://code.wireshark.org/review/15409
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoFix inclusion of images in PDF versions of the guides.
Jeff Morriss [Fri, 13 May 2016 01:02:22 +0000 (21:02 -0400)]
Fix inclusion of images in PDF versions of the guides.

We need to point xsltproc to the images directories.

The bigger images have scaling problems but at least they're
there now.

This is already done in cmake.

Change-Id: I260a8f3e335b9f5726811bcd6811f6c5b9f3a6b2
Reviewed-on: https://code.wireshark.org/review/15408
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agoautomake/nmake: run checkAPIs in ui/cli/
Jeff Morriss [Thu, 12 May 2016 15:02:57 +0000 (11:02 -0400)]
automake/nmake: run checkAPIs in ui/cli/

cmake already does this.

Use checkAPIs arguments appropriate to the cli directory (there's no gtk code
here so don't bother checking for deprecated gtk APIs).

Change-Id: I3e76ed5260223f05ac1b42431569bde3d1c596ea
Reviewed-on: https://code.wireshark.org/review/15403
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>