metze/wireshark/wip.git
7 years agoSMB2 FSCTL_SRV_ENUMERATE_SNAPSHOTS misnamed
Gordon Ross [Fri, 27 May 2016 00:55:09 +0000 (20:55 -0400)]
SMB2 FSCTL_SRV_ENUMERATE_SNAPSHOTS misnamed

The SMB2 ioctl FSCTL_SRV_ENUMERATE_SNAPSHOTS is currently
presented as FSCTL_GET_SHADOW_COPY_DATA (incorrect).

Bug: 11405
Change-Id: I7f025d1cf219c583666f4e6faedfc7adc3fbf14b
Reviewed-on: https://code.wireshark.org/review/15582
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoSMB2 Notify response shown as malformed
Gordon Ross [Fri, 27 May 2016 03:08:00 +0000 (23:08 -0400)]
SMB2 Notify response shown as malformed

SMB2 Notify needs to treat STATUS_NOTIFY_ENUM_DIR the same as success.
MS-SMB2 3.3.4.4 mentions this.

Bug: 12128
Change-Id: I3fea5f958449a469ccf66ea637db2d0db236c464
Reviewed-on: https://code.wireshark.org/review/15584
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoQt: Don't use QMap::first or ::last
Gerald Combs [Thu, 26 May 2016 15:29:27 +0000 (08:29 -0700)]
Qt: Don't use QMap::first or ::last

QMap::first and ::last were added in Qt 5.2.

Change-Id: I63bbb384aa75910bb96d8f75185ae90444b6c127
Reviewed-on: https://code.wireshark.org/review/15576
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoRemove some proto_item_append_string
Michael Mann [Thu, 26 May 2016 13:25:38 +0000 (09:25 -0400)]
Remove some proto_item_append_string

These calls to proto_item_append_string were not taking into account all
of the special treatment needed to use it, so proto_item_append_text
(or similar) was probably intended.

Change-Id: I5d1f092f8162a87d30fc8dc694f6124dc81372b5
Reviewed-on: https://code.wireshark.org/review/15575
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoRemove write capabilities from wtap_optionblocks.
Michael Mann [Sun, 22 May 2016 04:02:33 +0000 (00:02 -0400)]
Remove write capabilities from wtap_optionblocks.

The write functionality was too PCAPNG-specific and the intention is to
keep the option blocks as generic as possible.

So moved the write functionality back to pcapng.c and added a
wtap_opttype API to loop through all options in the block
(wtap_optionblock_foreach_option)

Change-Id: Iaf49126a1a3e2ed60ae02c52878ca22671dac335
Reviewed-on: https://code.wireshark.org/review/15525
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 agoCyclic PROFINET PROFIsafe RTC1 data dissection
T. Scholz [Thu, 19 May 2016 17:27:17 +0000 (13:27 -0400)]
Cyclic PROFINET PROFIsafe RTC1 data dissection

New implemented functions for profinet plug-in to read cyclic RTC1 data
frames more detailed and further to dissect PROFIsafe on PROFINET frames.

New functions include:
- Reading the PROFINET "Ident OK" Frame for detailed module information,
  as ModuleIdentNr., SubModuleIdentNr., etc. total dynamically
- Improved the existing dissection of fParameter with usage of GSDML-files,
  as the indexnumber for those parameters can change
- Reading a GSDML-file for further module-information, such as PROFIsafe
  Module, etc.
- Aded new pnio protocol preferences, in which the user can define its own
  network path to his GSDML-files, so that Wireshark is able to read those
  files for detailed information output.
- Added new filter functions for PROFINET and PROFIsafe
- All gained and saved information will be used to dissect the cyclic
  PROFINET frames

Bug: 12216
Change-Id: I379da1d349fa099047953042f1aa30450bee5b30
Reviewed-on: https://code.wireshark.org/review/14119
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
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>
7 years agoSMB NtCreate andX with extended response sometimes incorrect
Gordon Ross [Thu, 26 May 2016 01:54:20 +0000 (21:54 -0400)]
SMB NtCreate andX with extended response sometimes incorrect

Bug: 12473
Change-Id: Id513a89c5674e7288c7e0b12a06076eec18ff830
Reviewed-on: https://code.wireshark.org/review/15568
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 agoSMB Open andX extended response decoded incorrectly
Gordon Ross [Wed, 25 May 2016 22:56:33 +0000 (18:56 -0400)]
SMB Open andX extended response decoded incorrectly

Bug: 12472
Change-Id: I94740078631e96980f14ade5df8ae9694c9d73b1
Reviewed-on: https://code.wireshark.org/review/15565
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 agoQt: Add next / previous sequence shortcuts.
Gerald Combs [Wed, 25 May 2016 19:02:40 +0000 (12:02 -0700)]
Qt: Add next / previous sequence shortcuts.

Add next (N) and previous (P) keyboard shortcuts. The GTK+ UI uses the
down and up keys, but we're already using those for panning the Y axis.
Add a scroll margin when using N and P.

Add mouse wheel and trackpad support.

Disable mouse dragging for now until we figure out how to limit it to
our axis boundaries.

Ping-Bug: 12419
Change-Id: I292319928db365206277bf2bb3e42e14ef811ff0
Reviewed-on: https://code.wireshark.org/review/15559
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoUpdate the comments/warnings about using proto_tree_append_string().
Jeff Morriss [Wed, 25 May 2016 22:06:37 +0000 (18:06 -0400)]
Update the comments/warnings about using proto_tree_append_string().

packet-wsp.c hasn't used proto_tree_append_string() since
Ic5467289aae7d54e78c1fd65f93358387d6139aa.  Use packet-frame as the example
instead.

Change-Id: I69fb10679ec1685a61aac182414e596b345153fd
Reviewed-on: https://code.wireshark.org/review/15563
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>
7 years agoFix dissection of JXTA over UDP.
Jeff Morriss [Wed, 25 May 2016 21:35:43 +0000 (17:35 -0400)]
Fix dissection of JXTA over UDP.

Prior to this change all JXTA-over-UDP frames throw an exception after setting
COL_PROTOCOL.

The offset used when adding the protocol to the tree had already been
incremented to point to the end of the TVB; use tree_offset (which is the
current offset) instead.

This code has been here since r17282 (2006) so presumably the change is that
proto_tree_add_protocol_format() started throwing an exception when offset
points to the end of the TVB sometime between then and now.

Change-Id: Iadbcada29cd235e8abe5662b825a2d97ff6f7308
Reviewed-on: https://code.wireshark.org/review/15560
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoQt: Escape sequence dialog hint text.
Gerald Combs [Wed, 25 May 2016 21:39:20 +0000 (14:39 -0700)]
Qt: Escape sequence dialog hint text.

Escape HTML markup before showing hint text. Otherwise things like SIP
addresses won't be displayed correctly.

Change-Id: I5ceae978af0ff9e253dae4d3ec8ad9da20948de0
Reviewed-on: https://code.wireshark.org/review/15561
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 agoAdd P-Access-Network-Info decoding fields
Binh Trinh [Wed, 25 May 2016 02:46:17 +0000 (22:46 -0400)]
Add P-Access-Network-Info decoding fields

Change-Id: I62b9a768674952b8762bddcfe5a5f9d71b53fe4f
Reviewed-on: https://code.wireshark.org/review/15557
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 agoQt: Add Time and Comment labels to the sequence diagram.
Gerald Combs [Thu, 19 May 2016 02:21:02 +0000 (11:21 +0900)]
Qt: Add Time and Comment labels to the sequence diagram.

Add "Time" and "Comment" labels to the sequence diagram similar to the
GTK+ UI. Draw a border around the diagram as well.

Widen the default spacing and set it to a simple em-width multiple.

Fix our port number alignment.

Copy over the sequence diagram colors from the GTK+ UI and add them to
ColorUtils. Color sequences according to their respective conversation
numbers.

To do:
- Add zoom.

Ping-Bug: 12419
Change-Id: I3f9b4ffbfcc34aae1c38e303cd36ff207be247b1
Reviewed-on: https://code.wireshark.org/review/15554
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoRemove an extra break from a copy-and-pasteo.
Guy Harris [Wed, 25 May 2016 01:49:03 +0000 (18:49 -0700)]
Remove an extra break from a copy-and-pasteo.

Change-Id: I1f09d74f1d06260a08c8b975195d83c34e6ae253
Reviewed-on: https://code.wireshark.org/review/15556
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoClean up indentation.
Guy Harris [Wed, 25 May 2016 01:32:03 +0000 (18:32 -0700)]
Clean up indentation.

Change-Id: I6954dfe50eac07f8ab3df41d30a8285d329dcd98
Reviewed-on: https://code.wireshark.org/review/15555
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoRemove NULL checks after dereference (CID 1358549 and CID 1358683)
Jaap Keuter [Mon, 23 May 2016 18:22:17 +0000 (20:22 +0200)]
Remove NULL checks after dereference (CID 1358549 and CID 1358683)

Change-Id: If7eb246909abad2eeb9979cf14509a7d697dfd81
Reviewed-on: https://code.wireshark.org/review/15545
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 agoStylistic constency.
Guy Harris [Tue, 24 May 2016 20:11:37 +0000 (13:11 -0700)]
Stylistic constency.

Change-Id: I7a9b3889886ca80b1b999bb91862bc1a0ff80d9b
Reviewed-on: https://code.wireshark.org/review/15553
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoOPA MAD: fix Result of operation is garbage or undefined found by Clang Analyzer
Alexis La Goutte [Sun, 22 May 2016 16:33:21 +0000 (18:33 +0200)]
OPA MAD: fix Result of operation is garbage or undefined found by Clang Analyzer

Change-Id: I16a81cacef2b576f634a6726fa1620a0e6660e76
Reviewed-on: https://code.wireshark.org/review/15533
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Adam Goldman <adam.goldman@intel.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agomanolito: fix indent (remove unused tab/space)
Alexis La Goutte [Tue, 24 May 2016 11:51:28 +0000 (13:51 +0200)]
manolito: fix indent (remove unused tab/space)

Change-Id: Iebff327f91580b254f26dd85a5d2e5ed6da122f2
Reviewed-on: https://code.wireshark.org/review/15551
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoAdd support for Apple Create Context extensions.
Guy Harris [Tue, 24 May 2016 09:19:10 +0000 (02:19 -0700)]
Add support for Apple Create Context extensions.

Change-Id: I1e0f055e88610c559715b8431a82e7600beeae83
Reviewed-on: https://code.wireshark.org/review/15550
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoDocument wmem null guarantee
Evan Huus [Tue, 24 May 2016 02:12:19 +0000 (22:12 -0400)]
Document wmem null guarantee

Change-Id: Ibbbda815b144441f7db2d1920e1551c45e997370
Reviewed-on: https://code.wireshark.org/review/15549
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
7 years agoqt follow stream: set the file name before opening
Martin Kaiser [Mon, 23 May 2016 20:57:54 +0000 (22:57 +0200)]
qt follow stream: set the file name before opening

If we don't, Save As will always fail.

(I broke this in 6a992182ce47d721ce73eabf99983cea480dcf97)

Change-Id: I4abfe495af3aee470331ae5464acbd7d08028bf0
Reviewed-on: https://code.wireshark.org/review/15547
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agozigbee zdp: There are 32 bits in a guint32.
Martin Kaiser [Sun, 22 May 2016 16:12:41 +0000 (18:12 +0200)]
zigbee zdp: There are 32 bits in a guint32.

No need for obtuse math and lots of casting.

Change-Id: I41bf7dd98700b1b58eae93d36bb55e2e7017b506
Reviewed-on: https://code.wireshark.org/review/15532
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 agoQt: Enable Analyze -> Conversation Filter
D. Ulis [Sun, 22 May 2016 18:46:11 +0000 (14:46 -0400)]
Qt: Enable Analyze -> Conversation Filter

Exit early if there is no color rule before setting the parent menu enabled/disabled.

Bug: 12458
Change-Id: I37dc093681d3dc28afb60df7fd45e49ab804b2a1
Reviewed-on: https://code.wireshark.org/review/15538
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: Gerald Combs <gerald@wireshark.org>
7 years agoTCP: Fix Dereference of null pointer found by Clang analyzer
Alexis La Goutte [Thu, 14 Apr 2016 14:28:48 +0000 (16:28 +0200)]
TCP: Fix Dereference of null pointer found by Clang analyzer

Change-Id: Ie103b7f673db54056ad9edb15adb7fb7678ac336
Reviewed-on: https://code.wireshark.org/review/14916
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
7 years agoTCPCL: Return -1 when tcp_dissect_pdus asks for a length and it doesn't look like...
Michael Mann [Sun, 22 May 2016 18:22:18 +0000 (14:22 -0400)]
TCPCL: Return -1 when tcp_dissect_pdus asks for a length and it doesn't look like a TCPCL packet.

This will stop dissection of Bundle packets, but more importantly
prevents assertion in TCP dissector when trying to reassemble
the packets as TCPCL/Bundle.

Bug: 11395
Bug: 12462
Change-Id: I3a2ccd5e02022dfe03bc93d81bfbd3f2d3bcd8aa
Reviewed-on: https://code.wireshark.org/review/15537
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 agoMake sure EAPOL body is big enough for a EAPOL_RSN_KEY.
Michael Mann [Mon, 23 May 2016 00:21:17 +0000 (20:21 -0400)]
Make sure EAPOL body is big enough for a EAPOL_RSN_KEY.

A pointer to a EAPOL_RSN_KEY is set on the packet presuming the
whole EAPOL_RSN_KEY is there.  That's not always the case for
fuzzed/malicious captures.

Bug: 11585
Change-Id: Ib94b8aceef444c7820e43b969596efdb8dbecccd
Reviewed-on: https://code.wireshark.org/review/15540
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 agoInclude <sys/socket.h>, too.
Guy Harris [Mon, 23 May 2016 02:22:22 +0000 (19:22 -0700)]
Include <sys/socket.h>, too.

The Single UNIX Spec says AF_INET and AF_INET6 are defined by
<sys/socket.h>, which means you *should* include it if you want those
defines, and it doesn't look as if DragonFly BSD's <netinet/in.h>
includes it.

Do the includes in the order in whcih dumpcap does them.

Change-Id: I2ee611fc08a5487d5b8ed48396aa2a49447c881a
Reviewed-on: https://code.wireshark.org/review/15542
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoExplicitly include <netinet/in.h>.
Guy Harris [Mon, 23 May 2016 02:07:34 +0000 (19:07 -0700)]
Explicitly include <netinet/in.h>.

We use structures from it, and must not depend on <arpa/inet.h> or
<ifaddrs.h> to include it for us, as that doesn't necessarily happen on
all platforms (it doesn't happen on DragonFly BSD, for example).

Change-Id: Id0e6cc406b774efb076bb8e04827fdb7d502be16
Reviewed-on: https://code.wireshark.org/review/15541
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoAdd wtap_optionblock_set_option_string_format
Michael Mann [Fri, 20 May 2016 02:28:43 +0000 (22:28 -0400)]
Add wtap_optionblock_set_option_string_format

Also add a length parameter to wtap_optionblock_set_option_string

Change-Id: I8c7bbc48aa96b5c2a91ab9a17980928d6894f1ee
Reviewed-on: https://code.wireshark.org/review/15505
Reviewed-by: Anthony Coddington <anthony.coddington@endace.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoqt follow stream: don't crash when saving to an non-writable file
Martin Kaiser [Sun, 22 May 2016 17:44:25 +0000 (19:44 +0200)]
qt follow stream: don't crash when saving to an non-writable file

When the user clicks Save As in the Follow Stream window, check that the
selected target file can be opened for writing. Bring up a warning box
if the file is not writable.

Change-Id: I76e67b064377dd432d3b14592f5096b99d9968c0
Reviewed-on: https://code.wireshark.org/review/15536
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoRevert "zigbee zdp: remove some misleading casts"
Martin Kaiser [Sun, 22 May 2016 20:29:59 +0000 (22:29 +0200)]
Revert "zigbee zdp: remove some misleading casts"

It seems that the casts are required on OS X.

This reverts commit d8ef04c8914e162139594cfe0aee3072bc513e70.

Change-Id: I9644555552a6daab93334073a4fcf4f3f2522b59
Reviewed-on: https://code.wireshark.org/review/15539
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agozigbee zdp: remove some misleading casts
Martin Kaiser [Sun, 22 May 2016 16:08:13 +0000 (18:08 +0200)]
zigbee zdp: remove some misleading casts

sizeof() returns a size_t, which is unsigned

when we assign the result of sizeof() to an unsigned lvalue like a
guint, there's no point in casting to int

Change-Id: I9644c72a22a6dadb9ecd4073a4fcbd1c93517b59
Reviewed-on: https://code.wireshark.org/review/15531
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agomanolito: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Sun, 22 May 2016 16:52:45 +0000 (18:52 +0200)]
manolito: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I89a69c33486bf4b660118a816abcd2aa855e08d8
Reviewed-on: https://code.wireshark.org/review/15534
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agoBluetooth: Update Member UUIDs and CompanyIDs
Michal Labedzki [Sat, 7 May 2016 16:07:47 +0000 (18:07 +0200)]
Bluetooth: Update Member UUIDs and CompanyIDs

Update member UUIDs and CompanyIDs from Bluetooth Assign Numbers.

Change-Id: I5deb5b8e930d2df0296f17a3fe3b46989a28a86d
Reviewed-on: https://code.wireshark.org/review/15453
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agozigbee zdp: remove some unnecessary NULL checks
Martin Kaiser [Sun, 22 May 2016 15:48:23 +0000 (17:48 +0200)]
zigbee zdp: remove some unnecessary NULL checks

Change-Id: I8219105ccf38db6592e2ba4c83d1ec1da73abc4f
Reviewed-on: https://code.wireshark.org/review/15530
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years ago[Automatic update for 2016-05-22]
Gerald Combs [Sun, 22 May 2016 15:11:11 +0000 (08:11 -0700)]
[Automatic update for 2016-05-22]

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

Change-Id: I6ac498e507c71fd917eb0cfc3c4330a4c0ffcb64
Reviewed-on: https://code.wireshark.org/review/15527
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoQt: fix parameter 'overlay_image' not found in the function declaration [-Wdocumentation]
Alexis La Goutte [Sat, 21 May 2016 18:13:00 +0000 (20:13 +0200)]
Qt: fix parameter 'overlay_image' not found in the function declaration [-Wdocumentation]

Change-Id: I5f18d7ed5f4c830ce201fa6929fc1b7c0259692e
Reviewed-on: https://code.wireshark.org/review/15515
Reviewed-by: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>
Reviewed-by: Michael Mann <mmann78@netscape.net>
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>