metze/wireshark/wip.git
6 years agoRADIUS: Fix dissection for non-default VSA lengths
João Valverde [Wed, 14 Jun 2017 20:01:11 +0000 (21:01 +0100)]
RADIUS: Fix dissection for non-default VSA lengths

Ping-Bug: 13745
Change-Id: I1c9f69d0015ba9bea16d8300fbfd85abe110f829
Reviewed-on: https://code.wireshark.org/review/22136
Reviewed-by: João Valverde <j@v6e.pt>
6 years agoIEEE 802.15.4: Fix IE/MIC handling of secured packets without payload
Robert Sauter [Wed, 14 Jun 2017 05:52:59 +0000 (07:52 +0200)]
IEEE 802.15.4: Fix IE/MIC handling of secured packets without payload

Change-Id: Icdcb770723e3783013f525524c3fe745d5dd862d
Reviewed-on: https://code.wireshark.org/review/22122
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>
6 years agopacket-lorawan.c: get_encryption_keys_app_eui must be included in GCRYPT_VERSION_NUMB...
Michael Mann [Wed, 14 Jun 2017 14:49:10 +0000 (10:49 -0400)]
packet-lorawan.c: get_encryption_keys_app_eui must be included in GCRYPT_VERSION_NUMBER check

Change-Id: I35d4ab99690839c3999e3fb5b471027271a81042
Reviewed-on: https://code.wireshark.org/review/22132
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years ago[tap-rtp-common] Add EVS to mimetype_and_clock_map
Anders [Wed, 14 Jun 2017 11:35:28 +0000 (13:35 +0200)]
[tap-rtp-common] Add EVS to mimetype_and_clock_map

Change-Id: I21b3d023c8644421059d84b0905ff264e991c8a8
Reviewed-on: https://code.wireshark.org/review/22127
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoLoRaWAN: Use proto_tree_add_checksum for MIC verification
Erik de Jong [Tue, 13 Jun 2017 17:54:05 +0000 (19:54 +0200)]
LoRaWAN: Use proto_tree_add_checksum for MIC verification

Change-Id: Iaf705172496e26f571f77902bcc1a95f3b817c80
Reviewed-on: https://code.wireshark.org/review/22098
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoDOCSIS: Prevent infinite loop from unknown FCParm.
Michael Mann [Wed, 14 Jun 2017 00:37:11 +0000 (20:37 -0400)]
DOCSIS: Prevent infinite loop from unknown FCParm.

concatlen was not updated if FCParm was unknown, leading to an infinite loop.

Bug: 13797
Change-Id: I1b64d757a369183a711f01b0b5cd1ba7aa0787bc
Reviewed-on: https://code.wireshark.org/review/22120
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>
6 years agoWBXML: Fix some more potential infinite loops.
Michael Mann [Wed, 14 Jun 2017 03:05:24 +0000 (23:05 -0400)]
WBXML: Fix some more potential infinite loops.

tvb_get_guintvar can generate some unrealistic values so do some
sanity checking on them.

Bug: 13796
Change-Id: I2d5f7a48c2e982a419ea6ab3ac0000be3b6bcbc7
Reviewed-on: https://code.wireshark.org/review/22121
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>
6 years agoSMB2: Improve FILE_ALL_INFORMATION query response.
Richard Sharpe [Tue, 13 Jun 2017 22:05:24 +0000 (15:05 -0700)]
SMB2: Improve FILE_ALL_INFORMATION query response.

Add support for the fields Position Information, Mode Information
and Alignment Information in the FILE_ALL_INFORMATION query response.

Bug: 13800
Change-Id: I838fba1df26fe0f65394f0fe31b83645a707c166
Reviewed-on: https://code.wireshark.org/review/22117
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
6 years agoRADIUS: Add comment explaining WiMAX non-standard VSA format
João Valverde [Wed, 14 Jun 2017 00:32:37 +0000 (01:32 +0100)]
RADIUS: Add comment explaining WiMAX non-standard VSA format

Change-Id: I5b3417c94ab10d4ed22258bdb2ef0f670dd2b995
Reviewed-on: https://code.wireshark.org/review/22118
Reviewed-by: João Valverde <j@v6e.pt>
6 years agoDon't use frame_length at all if we don't have libgcrypt >= 1.6.0 and encryption...
Guy Harris [Tue, 13 Jun 2017 21:11:02 +0000 (14:11 -0700)]
Don't use frame_length at all if we don't have libgcrypt >= 1.6.0 and encryption keys.

Change-Id: Ia82fa67bbb9056204ed70b150f3d1e6db9ceed25
Reviewed-on: https://code.wireshark.org/review/22116
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoFix automatic name resolution not saved to NRB
Anthony Coddington [Fri, 9 Jun 2017 05:16:27 +0000 (17:16 +1200)]
Fix automatic name resolution not saved to NRB

Clear DUMMY_ADDRESS_ENTRY when add_ipv4_name/add_ipv6_name. This flag is checked in ipv4_hash_table_resolved_to_list().
TODO: clean up these flags as they are confusing and DUMMY appears somewhat redundant.

Change-Id: I81d40cc778cbe5c36314631d3fa0997cee409368
Bug: 13798
Reviewed-on: https://code.wireshark.org/review/22109
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agotime() is a system routine; don't call a variable by that name.
Guy Harris [Tue, 13 Jun 2017 20:50:04 +0000 (13:50 -0700)]
time() is a system routine; don't call a variable by that name.

That squelches a compiler warning.

Change-Id: Ia39a9e5fe54a03e813bc3b82088ddf5de4a19c72
Reviewed-on: https://code.wireshark.org/review/22113
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years ago[MEGACO] Add tman/sdr as an integer with a unit string.
Anders [Tue, 13 Jun 2017 15:31:21 +0000 (17:31 +0200)]
[MEGACO] Add tman/sdr as an integer with a unit string.

Change-Id: I987b4a9a86b0000b726f7e514be741e713b6ec5a
Reviewed-on: https://code.wireshark.org/review/22112
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: Martin Kaiser <wireshark@kaiser.cx>
6 years agofile-pcapng: fix capture filter dissection
Peter Wu [Thu, 8 Jun 2017 17:00:20 +0000 (19:00 +0200)]
file-pcapng: fix capture filter dissection

The pcapng spec[1] suggests that the first octet marks the filter type,
but it is not clear whether this other types are implemented. Just skip
over the byte for now.

 [1]: https://github.com/pcapng/pcapng/blob/c0dd7a7391/draft-tuexen-opsawg-pcapng.xml#L1083

Change-Id: I272dac55ea9ca3798e1fea45ce92023f7aa82564
Reviewed-on: https://code.wireshark.org/review/22043
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
6 years agoFix isobus-vt warning when compiling using checkhf-conflicts.
Jeroen Sack [Tue, 13 Jun 2017 09:01:26 +0000 (11:01 +0200)]
Fix isobus-vt warning when compiling using checkhf-conflicts.

Bug: 13772
Change-Id: I9690b88096bbd4a3dc8f082f9f485166e517a4a6
Reviewed-on: https://code.wireshark.org/review/22111
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>
6 years agofixed integer overflow in zigbee timestamp conversion
Martin Boye Petersen [Mon, 12 Jun 2017 11:35:52 +0000 (13:35 +0200)]
fixed integer overflow in zigbee timestamp conversion

Change-Id: Ibc9e0a9285692ff95d28faf272c25d0e452f359c
Reviewed-on: https://code.wireshark.org/review/22094
Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com>
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>
6 years agoAdd support for dissecting FIND responses of FileIdFullDirectoryInfo type.
Richard Sharpe [Mon, 12 Jun 2017 22:19:18 +0000 (15:19 -0700)]
Add support for dissecting FIND responses of FileIdFullDirectoryInfo type.

Simply had to copy an existing one and remove unneeded field etc.

Fix bug 13795. Attached a capture showing the problem to the bug report.
Change-Id: I93d5cdac3f336cbe0bd93db76a84bf97cbfa00ac
Reviewed-on: https://code.wireshark.org/review/22106
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agossl: fix duplicate heuristics dissector registration
Peter Wu [Mon, 12 Jun 2017 21:49:44 +0000 (23:49 +0200)]
ssl: fix duplicate heuristics dissector registration

Whenever a SSL preference is set (e.g. through tshark -ossl.psk:x),
proto_reg_handoff_ssl is invoked. This is currently necessary for
registering ports from the RSA keys table, but things like heuristics
dissectors should be registered only once. Fixes warning during tests:

    "Protocol Secure Sockets Layer is already registered in "tcp" table

Change-Id: I08fc9da524888e00eea7b0d0df54f3f0a3f08eb5
Fixes: v2.5.0rc0-109-ge815bbb2e6 ("ssl: add heuristics to detect SSL/TLS on non-standard TCP port")
Reviewed-on: https://code.wireshark.org/review/22105
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoImprove the HTTP2 dissector by not inserting empty padding, which looks ugly.
Richard Sharpe [Mon, 12 Jun 2017 20:59:22 +0000 (13:59 -0700)]
Improve the HTTP2 dissector by not inserting empty padding, which looks ugly.

Change-Id: Ia01ae12fc9a22a7d0031c4580bbafe09f75881b5
Reviewed-on: https://code.wireshark.org/review/22104
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoFix the display of the IPv4 Hash Table in Resolved Addresses Dialog QT UI
sfd [Tue, 13 Jun 2017 02:31:24 +0000 (14:31 +1200)]
Fix the display of the IPv4 Hash Table in Resolved Addresses Dialog QT UI

Was sign extending the key to 64-bit in Linux.

GPOINTER_TO_UINT should not be stored in 'int', use guint.

Change-Id: Ib4a994fdda5d69a589d3cffce644584103f2cd1d
Reviewed-on: https://code.wireshark.org/review/22107
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoDon't assume we have the libgcrypt MAC functions.
Guy Harris [Tue, 13 Jun 2017 03:47:59 +0000 (20:47 -0700)]
Don't assume we have the libgcrypt MAC functions.

Not all the versions we support have them.

Change-Id: I7851db692a0bff0fb22ab9d40c8d5f9dc3730fef
Reviewed-on: https://code.wireshark.org/review/22108
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoieee802154: fix parameter 'p_inf_elem_tree_mlme' not found in the function declaratio...
Alexis La Goutte [Mon, 12 Jun 2017 19:39:59 +0000 (19:39 +0000)]
ieee802154: fix parameter 'p_inf_elem_tree_mlme' not found in the function declaration [-Wdocumentation]

Change-Id: I43eadb4be618163255297bb8a54bde4d6e537747
Reviewed-on: https://code.wireshark.org/review/22101
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>
6 years agoEPL (profiler parser): fix redundant redeclaration of ‘epl_wmem_iarray_is_empty/sorte...
Alexis La Goutte [Mon, 12 Jun 2017 19:43:30 +0000 (19:43 +0000)]
EPL (profiler parser): fix redundant redeclaration of ‘epl_wmem_iarray_is_empty/sorted’ [-Wredundant-decls]

Change-Id: Ia969ffddc0035b18e7a4afc67d0c830f082938ea
Reviewed-on: https://code.wireshark.org/review/22103
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>
6 years agoEPL: fix redundant redeclaration of ‘epl_profile_uat_fld_fileopen_check_cb’ [-Wredund...
Alexis La Goutte [Mon, 12 Jun 2017 19:42:54 +0000 (19:42 +0000)]
EPL: fix redundant redeclaration of ‘epl_profile_uat_fld_fileopen_check_cb’ [-Wredundant-decls]

Change-Id: I44ba825648eb707942c4ea576c850c94f4891fb1
Reviewed-on: https://code.wireshark.org/review/22102
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoAdd ISOBUS dissector to release notes.
Jeroen Sack [Mon, 12 Jun 2017 13:31:43 +0000 (15:31 +0200)]
Add ISOBUS dissector to release notes.

Bug: 13772
Change-Id: I13726ec22fcec523fc837655fe5124a600639e39
Reviewed-on: https://code.wireshark.org/review/22095
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years agoIEEE 802.15.4: Fix double offset increment for Time Correction Header IE
Robert Sauter [Sun, 11 Jun 2017 23:22:44 +0000 (01:22 +0200)]
IEEE 802.15.4: Fix double offset increment for Time Correction Header IE

Regression by https://code.wireshark.org/review/21890/

Change-Id: Ieb90672dc2181f5951a8a4165e2676b7882282e5
Reviewed-on: https://code.wireshark.org/review/22087
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoExtract errno value_strings from usb code
Peter Wu [Mon, 8 Aug 2016 12:51:38 +0000 (14:51 +0200)]
Extract errno value_strings from usb code

The convention of returning negative errno codes from the Linux kernel
is not just limited to usb/usbip, it is also needed by netlink. Now
netlink error codes are properly dissected.

Also add ERFKILL and EHWPOISON (since 2009 and 2011) and change ESTALE
and ENOSYS to match the current description as of Linux 4.7. Fixed
header paths in comments too.

Used this command to generate the table (with fixups for gaps):

    cpp -dM -CC include/uapi/asm-generic/errno.h |
    perl -ne '/^#define (E[A-Z0-9]+) ([0-9]+) \/\* (.+) \*\// &&
    printf "    { -%-4s \"%s (-%s)\" },\n", "$2,", $3, $1' | sort -k2

Change-Id: I16fa41a42bd4201a8383ea8e70a0aa8a597b311d
Reviewed-on: https://code.wireshark.org/review/16952
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>
6 years agossl: add heuristics to detect SSL/TLS on non-standard TCP port
Peter Wu [Sun, 11 Jun 2017 19:26:48 +0000 (21:26 +0200)]
ssl: add heuristics to detect SSL/TLS on non-standard TCP port

TLS is quite easy to identify. When you see prefix "17 03 01"
(Application Data, TLS 1.0) or "15 03 01" (Handshake, TLS 1.0), it is
likely TLS. Rather than requiring manual Decode As, add a heuristic.

Note that the Application Data protocol might still require a manual
Decode As if the ALPN extension is missing or if the protocol (like
HTTP) is not registered as SSL/TLS heuristics dissector.

Change-Id: I2eac2aded821d3fd100bc5627850b936fadb63f7
Ping-Bug: 13743
Reviewed-on: https://code.wireshark.org/review/22083
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>
6 years agoprint_stream.c: Fix compile error on Windows regression
Robert Sauter [Mon, 12 Jun 2017 05:04:42 +0000 (07:04 +0200)]
print_stream.c: Fix compile error on Windows regression

Put closing #endif inside function body.

Regression by https://code.wireshark.org/review/22086/

Change-Id: I6f49dd45598c77c0a10c62f18f85fd7b99aba975
Reviewed-on: https://code.wireshark.org/review/22088
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoDissector for LoRaWAN
Erik de Jong [Mon, 5 Jun 2017 15:59:03 +0000 (17:59 +0200)]
Dissector for LoRaWAN

Initial implementation of LoRaWAN dissector based on LoRa Alliance specification.
Features:
- Frame dissection for fields as per documentation
- Payload decryption
- MIC verification

Not implemented:
- Region specific information (frequencies etc)
- Statistics

Bug: 13775
Change-Id: I6031755dfd582dd78ed7c2566cdb390c577c9078
Reviewed-on: https://code.wireshark.org/review/22017
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoAdd isobus dissector
Jeroen Sack [Thu, 11 May 2017 11:55:11 +0000 (13:55 +0200)]
Add isobus dissector

Bug: 13772

Change-Id: If7ddb10bfc8a1756e8ed00baaa8a28a7e2840a37
Reviewed-on: https://code.wireshark.org/review/21594
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>
6 years agoAdd support for color xml attributes in psml and pdml formats.
Michael Mann [Sun, 11 Jun 2017 16:03:13 +0000 (12:03 -0400)]
Add support for color xml attributes in psml and pdml formats.

Bug: 6682
Change-Id: I19330d06aa3d5692503c61369c3c650d595971f5
Reviewed-on: https://code.wireshark.org/review/22077
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Donnelly <stephen.donnelly@endace.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoAdd a big comment about the ISO 8613-6/T.416 SGR support.
Guy Harris [Sun, 11 Jun 2017 22:14:29 +0000 (15:14 -0700)]
Add a big comment about the ISO 8613-6/T.416 SGR support.

Also, the signature of print_color_escape() must be the same on Windows
and UN*X; put the function body, but not the opening part of the
definition, inside #ifdefs.

Change-Id: I060e01d3280bfc4596a852211f5ab3c58d1e8642
Reviewed-on: https://code.wireshark.org/review/22086
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agonetflow: fix typo adresses => addresses
Alexis La Goutte [Thu, 8 Jun 2017 10:03:27 +0000 (10:03 +0000)]
netflow: fix typo adresses => addresses

Change-Id: I8578f86f75b1a7278ad71d8671ce4e2dbc4f0c82
Reviewed-on: https://code.wireshark.org/review/22081
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoaddress(.h): fix typo adresses => addresses
Alexis La Goutte [Sun, 11 Jun 2017 19:30:49 +0000 (19:30 +0000)]
address(.h): fix typo adresses => addresses

Change-Id: Ibc787005bb7865da55d2d8257009bace1108f181
Reviewed-on: https://code.wireshark.org/review/22082
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoRanap: improve heuristic algorithm
Ivan Nardi [Sun, 11 Jun 2017 15:27:58 +0000 (17:27 +0200)]
Ranap: improve heuristic algorithm

Strength the heuristic cheking PDU-Type and Criticality field values too

Change-Id: Id95603634a93033664bdbd169880e6b411cfbc11
Bug: 13791
Reviewed-on: https://code.wireshark.org/review/22076
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>
6 years agoDon't colorize a line if we have no color filter.
Guy Harris [Sun, 11 Jun 2017 19:03:59 +0000 (12:03 -0700)]
Don't colorize a line if we have no color filter.

There's no guarantee that there's a color filter that matches, so the
color filter pointer might be null.

Change-Id: Ia11845824a4ca9c0cc153a89aa2fba876084a796
Reviewed-on: https://code.wireshark.org/review/22079
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoprint.c: Remove unused hf_ variables
Michael Mann [Sun, 11 Jun 2017 16:06:44 +0000 (12:06 -0400)]
print.c: Remove unused hf_ variables

Some hf_ variables were "cached" in print.c to break dependency on (frame)
dissectors.  They are no longer used (and check*.pl scripts found them)

Change-Id: Ib46e5f5e58da54b6d7a3f85586581507f653c55a
Reviewed-on: https://code.wireshark.org/review/22078
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoFix airpdcap compilation on Sun
Petr Sumbera [Sun, 11 Jun 2017 13:32:12 +0000 (15:32 +0200)]
Fix airpdcap compilation on Sun

Bug: 13786
Change-Id: Iaa3890610768605b5c579aaddc73124b9f85bdd9
Reviewed-on: https://code.wireshark.org/review/22074
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agotshark: add "--color" option emulating wireshark colors
Dave Goodell [Tue, 25 Apr 2017 05:19:18 +0000 (22:19 -0700)]
tshark: add "--color" option emulating wireshark colors

With this commit, tshark will mimic the packet coloring present in the
Wireshark GUI whenever "--color" is passed.  This initial commit only
adds such support for the standard text output format.  A future commit
could potentially broaden this support to other output modes (such as
"-V" mode).

Bug: 5158
Change-Id: I59329e32475b0c67e28802e79610544d4868ea2d
Reviewed-on: https://code.wireshark.org/review/21325
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoprint_stream: add a new print_line_color() method
Dave Goodell [Tue, 25 Apr 2017 05:14:42 +0000 (22:14 -0700)]
print_stream: add a new print_line_color() method

This new interface allows printing a line with specified foreground and
background colors.  The implementation avoids printing escape sequences
if the output stream is not a TTY and note that escape sequences are
ignored on Windows.

This initial implementation relies on relatively modern 24-bit color
support which is present in many terminal emulators but may not always
display properly on older or simpler emulators. Windows coloring is
handled with SetConsoleTextAttribute, which offers a "1-bit" color
experience (but it's better than nothing)

This commit is a precursor to adding additional coloring to tshark.

Bug: 5158
Change-Id: Ib2b9d800095a065a4bb60abe0550862cda5539ec
Reviewed-on: https://code.wireshark.org/review/21324
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agopacket-spdy: Fix -Wunused-const-variable error when compiling without zlib
Robert Sauter [Sun, 11 Jun 2017 10:37:14 +0000 (12:37 +0200)]
packet-spdy: Fix -Wunused-const-variable error when compiling without zlib

Change-Id: Id471772488d3a0568f16f604585b3155a57e47b2
Reviewed-on: https://code.wireshark.org/review/22072
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>
6 years agonvme: add dissection for nvme identify command
Nitzan Carmi [Thu, 4 May 2017 14:35:37 +0000 (17:35 +0300)]
nvme: add dissection for nvme identify command

This patch dissects identify command parameters issued on NVMe AQ.

Change-Id: I5708f22a44b1eb6f207f66912cfaa71f016db8cd
Signed-off-by: Nitzan Carmi <nitzanc@mellanox.com>
Tested-by: Nitzan Carmi <nitzanc@mellanox.com>
Reviewed-by: Parav Pandit <parav@mellanox.com>
Reviewed-on: https://code.wireshark.org/review/22071
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: Martin Kaiser <wireshark@kaiser.cx>
6 years ago[Automatic update for 2017-06-11]
Gerald Combs [Sun, 11 Jun 2017 08:11:09 +0000 (08:11 +0000)]
[Automatic update for 2017-06-11]

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

Change-Id: Ia8c543f56fc9d09e78174d76144577a99359cc39
Reviewed-on: https://code.wireshark.org/review/22067
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoWindows: increase minimum CMake version to 3.7
Pascal Quantin [Sat, 10 Jun 2017 14:31:52 +0000 (16:31 +0200)]
Windows: increase minimum CMake version to 3.7

g9f0d22b introduced the use of GREATER_EQUAL operator. Let's update the
minimum CMake version accordingly.

Change-Id: Ibf619a24f5ee296b547fbc6ba46e13b8a1f3302c
Reviewed-on: https://code.wireshark.org/review/22066
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoSimplify the search for HTMLHelp.
Anders [Fri, 9 Jun 2017 14:02:21 +0000 (16:02 +0200)]
Simplify the search for HTMLHelp.

Change updated as per https://gitlab.kitware.com/cmake/cmake/issues/16950#note_277462

Change-Id: I794e6cf7af3d1affa7ee5182374b6f22d9acdf33
Reviewed-on: https://code.wireshark.org/review/22051
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>
6 years agoECDSA+DSA SHA2 algorithm OIDs added to PKCS1 dissector
Martin Peylo [Fri, 9 Jun 2017 08:34:40 +0000 (11:34 +0300)]
ECDSA+DSA SHA2 algorithm OIDs added to PKCS1 dissector

Those algorithms are e.g. used to sign X.509 certificates, or in CMP (RFC4210)
messages.

It is not fully deterministic to which dissector those OIDs should be added,
PKCS1 is chosen as there are already the OIDs for the ECC curves and the OIDs
in question are also listed in PKIXAlgs-2009.asn.

Change-Id: I4fc41d27220400c37695ecce5d7f05726ad39af2
Reviewed-on: https://code.wireshark.org/review/22049
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>
6 years agoResync some ASN.1 dissectors.
Michael Mann [Sat, 10 Jun 2017 13:14:02 +0000 (09:14 -0400)]
Resync some ASN.1 dissectors.

NBAP and RANAP regenerated don't match current branch

Change-Id: I033997f4db15255b1439626cf973d218c1ad8416
Reviewed-on: https://code.wireshark.org/review/22065
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: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoFix indentation.
Guy Harris [Sat, 10 Jun 2017 02:59:39 +0000 (19:59 -0700)]
Fix indentation.

Change-Id: I9ea3947a4100d4d566c0d6815de5336214f9f581
Reviewed-on: https://code.wireshark.org/review/22062
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoPut the non-filter part of epan/color_filters.h into wsutil/color.h.
Guy Harris [Sat, 10 Jun 2017 01:43:00 +0000 (18:43 -0700)]
Put the non-filter part of epan/color_filters.h into wsutil/color.h.

Places that only need color_t, such as certain preferences, don't need
the color filter stuff.

Change-Id: I88fc2858454d04e659b323a8bc28b21d362ca3fb
Reviewed-on: https://code.wireshark.org/review/22060
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoFix weird comment.
Guy Harris [Sat, 10 Jun 2017 00:48:46 +0000 (17:48 -0700)]
Fix weird comment.

Change-Id: I4254b37b14631929681b5642dc44911019807cb1
Reviewed-on: https://code.wireshark.org/review/22058
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoJust print the string color_filters_init() provides on an error.
Guy Harris [Fri, 9 Jun 2017 22:38:05 +0000 (15:38 -0700)]
Just print the string color_filters_init() provides on an error.

It gives all the necessary details; no need to mention the name of a
routine the existence of which the user is probably unaware.

Change-Id: I66d372bc6650c84fbbc6be438be695eff1048413
Reviewed-on: https://code.wireshark.org/review/22055
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoHandle filter open and read errors better.
Guy Harris [Fri, 9 Jun 2017 22:04:32 +0000 (15:04 -0700)]
Handle filter open and read errors better.

If the user's color filter file exists but can't be opened, fail and
return a failure indication.

If it doesn't exist, just try reading the global color filter file.

If *that* exists but can't be opened, fail and return a failure
indication; if it doesn't exist, don't treat that as an error.

Change-Id: I5ebdc0eb1ada3cc190990be9228639304f32147e
Reviewed-on: https://code.wireshark.org/review/22054
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoAdd URL for link specifying D-Bus maximum message length.
Guy Harris [Fri, 9 Jun 2017 20:19:09 +0000 (13:19 -0700)]
Add URL for link specifying D-Bus maximum message length.

Change-Id: I5797407a18fda674b2c9b2cc1c192c211c91c496
Reviewed-on: https://code.wireshark.org/review/22052
Reviewed-by: Guy Harris <guy@alum.mit.edu>
6 years agoNSIS: Add support for Visual Studio 2017.
Gerald Combs [Thu, 8 Jun 2017 17:39:05 +0000 (10:39 -0700)]
NSIS: Add support for Visual Studio 2017.

Also fixes a bug where vcredist was found in
C:\Program Files\Wireshark

Change-Id: I0bc5c7410a95677d21c2e28ba66d6a9d186fe2a9
Reviewed-on: https://code.wireshark.org/review/22044
Petri-Dish: Anders Broman <a.broman58@gmail.com>
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>
6 years agoAdd BGP dissector support for draft-ietf-idr-bgp-prefix-sid-05
Evelio Vila [Sun, 21 May 2017 12:03:53 +0000 (05:03 -0700)]
Add BGP dissector support for draft-ietf-idr-bgp-prefix-sid-05

Bug: 12296
Change-Id: Ib49396e2822f6ee0082aedd39ed8636379bbd75a
Reviewed-on: https://code.wireshark.org/review/21726
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@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>
6 years ago802.15.4: Improved ZBOSS header dissection.
Alexander Nogikh [Thu, 8 Jun 2017 14:18:21 +0000 (17:18 +0300)]
802.15.4: Improved ZBOSS header dissection.

Implemented extraction of 802.15.4 page number information.

Change-Id: Icff736a6c1d498ec6375721c5b07cc3e37bea955
Reviewed-on: https://code.wireshark.org/review/22040
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoieee80211-radio: Fix calculation of frame start time
Simon Barber [Wed, 7 Jun 2017 19:06:26 +0000 (12:06 -0700)]
ieee80211-radio: Fix calculation of frame start time

With captures where TSF indicates the end of the frame the
preamble was being counted twice in the calculation of the start.

Change-Id: I3d042d8ea3bc46a833438cb3d2f75e3499a7711d
Reviewed-on: https://code.wireshark.org/review/22020
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years agoCMake: Look for Python in more places.
Gerald Combs [Thu, 8 Jun 2017 22:30:35 +0000 (15:30 -0700)]
CMake: Look for Python in more places.

According to PEP 514, Python.org's Windows installer stores its
installation path in

HKEY_LOCAL_MACHINE\Software\Python\<Company>\<Tag>\InstallPath

where <Tag> is the value of sys.winver. Newer versions of python add "-32"
and "-64" to the version in order to allow side by side installations.
Adjust LocatePythonExecutable accordingly.

Change-Id: I8c7f8b4c31b37e7f687ce9909f97d62a779cfa91
Reviewed-on: https://code.wireshark.org/review/22048
Reviewed-by: Gerald Combs <gerald@wireshark.org>
6 years agoIEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE
Pascal Quantin [Thu, 8 Jun 2017 12:44:49 +0000 (14:44 +0200)]
IEEE 802.15.4: fix dissection of Enhanced Beacon Filter IE

Bug: 13778
Change-Id: I6550dcf285f7c8f9de5999203ea7a91468d9bd9f
Reviewed-on: https://code.wireshark.org/review/22038
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>
6 years agosharkd: fix a shadow warning when compiling on RHEL/CentOS 6.x
Pascal Quantin [Thu, 8 Jun 2017 20:16:36 +0000 (22:16 +0200)]
sharkd: fix a shadow warning when compiling on RHEL/CentOS 6.x

Bug: 13424
Change-Id: I20e474180545d89599c346ad2c5994949d213cb0
Reviewed-on: https://code.wireshark.org/review/22045
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
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>
6 years agopacket-lapd.c: Replace heuristic UDP dissector with "deterministic" one with prefs.
Piotr Tulpan [Tue, 6 Jun 2017 14:26:02 +0000 (16:26 +0200)]
packet-lapd.c: Replace heuristic UDP dissector with "deterministic" one with prefs.

Remove the heuristic dissector that checks for arbitrary UDP ports in favor
of adding a preference for the range of UDP ports that can be used for LAPD.

Change-Id: Ib85fbee4a433727af24279fffb0cbf2c25f7d292
Reviewed-on: https://code.wireshark.org/review/21985
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoGTPv2: Added decoding of Serving PLMN Rate Control and Counter IE
Marius Paliga [Thu, 8 Jun 2017 10:52:42 +0000 (12:52 +0200)]
GTPv2: Added decoding of Serving PLMN Rate Control and Counter IE

As defined in 3GPP TS 29.274 V14.3.0

Change-Id: I79140dfb2f64b7e444f80dcab09e94bc868df097
Reviewed-on: https://code.wireshark.org/review/22036
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoX11: Add support for the BIG-REQUESTS extension
Uli Schlachter [Mon, 5 Jun 2017 14:14:34 +0000 (16:14 +0200)]
X11: Add support for the BIG-REQUESTS extension

The length field in an X11 request has two bytes. The BIG-REQUESTS
extension allows larger events. Its use (after properly being enabled
via an extension request) is indicated by setting the two-byte length
field to zero. In this case, the next four bytes indicate the real
length of the request. See e.g.:
https://www.x.org/releases/X11R7.7/doc/bigreqsproto/bigreq.html

Bug: 13763
Change-Id: I34ef8b47380fedcb16ab62cb8195fb136a45fe21
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-on: https://code.wireshark.org/review/21964
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>
6 years agoepl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Wed, 7 Jun 2017 10:36:07 +0000 (12:36 +0200)]
epl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Ibe5d2e21fcda05fa8ee52157630d4896deaef440
Reviewed-on: https://code.wireshark.org/review/22003
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoLTE RRC: fix filtering of q-RxLevMin parameter
Pavel Strnad [Thu, 8 Jun 2017 13:23:53 +0000 (15:23 +0200)]
LTE RRC: fix filtering of q-RxLevMin parameter

Ensure that filter as a different abbreviation depending on the
technology used.

Bug: 13481
Change-Id: I14782dffcf70bdb015fd705d2184ae8c42f232c5
Reviewed-on: https://code.wireshark.org/review/22039
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>
6 years agoFP: Prevent UE ID overriding in dissection
Darien Spencer [Wed, 7 Jun 2017 04:05:50 +0000 (21:05 -0700)]
FP: Prevent UE ID overriding in dissection

Changed some channels' dissection methods to not override the U-RNTI set
for RLC reassembly with 'communication context'

Change-Id: Ibddb35e810e433ca4f40665c196c9ea2e35bff51
Reviewed-on: https://code.wireshark.org/review/22011
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>
6 years agoCMake: Add local copy of FindHTMLHelp.cmake
Graham Bloice [Thu, 8 Jun 2017 12:38:40 +0000 (13:38 +0100)]
CMake: Add local copy of FindHTMLHelp.cmake

Add a local copy of FindHTMLHelp.cmake to search for hhc.exe that
includes the 32 bit program files locations "Program Files (x86)"
as this is where hhc.exe normally lives.

Change-Id: Ic5917a0765786ac483a7d4ef457043319d0e8501
Reviewed-on: https://code.wireshark.org/review/22037
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
6 years agoGTPv2: Add CIOT flag into Node Features
Marius Paliga [Thu, 8 Jun 2017 08:13:56 +0000 (10:13 +0200)]
GTPv2: Add CIOT flag into Node Features

Updated to be in line with 3GPP TS 29.274 V14.3.0

Change-Id: Iaa6fdc6999c470d9a826f50b5d55fa1058f58cd1
Reviewed-on: https://code.wireshark.org/review/22032
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoexport-smb2-objects: Make sure tap be called for named pipe
linzhao115 [Thu, 8 Jun 2017 02:52:53 +0000 (19:52 -0700)]
export-smb2-objects: Make sure tap be called for named pipe

smb2_eo_tap is not called when smb2 packets are dissected as
named pipe then exit. Basically, for the following code snippet,

if (length) {
int old_offset = offset;
...
offset = dissect_file_data_smb2_pipe(...);
if (offset != oldoffset) {
/* managed to dissect pipe data */
return offset;
...

dissect_file_data_smb2_pipe() always returns a different offset,
thus it will never hit the smb2_eo_tap related code below that
are needed for exporting smb2 objects.

As a quick fix, call the tap related code before returning.

Bug: 13214
Change-Id: I7a99177947c384f53424b209f7e5c1f9963b5da8
Reviewed-on: https://code.wireshark.org/review/22031
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoftp-data: treat \r\n as printable. Also show number of lines in text lines
Martin Mathieson [Wed, 7 Jun 2017 21:17:30 +0000 (22:17 +0100)]
ftp-data: treat \r\n as printable.  Also show number of lines in text lines

Change-Id: Icd34030fe023cd52fa7b2df8c506c00d5ced046a
Reviewed-on: https://code.wireshark.org/review/22023
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
6 years agowsmp: read the message length as big endian
Martin Kaiser [Wed, 7 Jun 2017 21:26:33 +0000 (23:26 +0200)]
wsmp: read the message length as big endian

We add the message length to the tree as big endian but we interpret it
as little endian for our further calculations. This causes parsing
errors. Use big endian for both cases.

Bug: 13766
Change-Id: I4e6cdb7d4267be96ea78eb664e88c532a9a90b52
Reviewed-on: https://code.wireshark.org/review/22024
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoradiotap: no expert info under if (tree) please
Martin Kaiser [Wed, 7 Jun 2017 21:37:51 +0000 (23:37 +0200)]
radiotap: no expert info under if (tree) please

Change-Id: Id7f6d5d2b108d98a7c40fd01e3f35ad20076f54b
Reviewed-on: https://code.wireshark.org/review/22025
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoieee80211-radio: Fix description of packet start and end time fields
Simon Barber [Wed, 7 Jun 2017 20:38:08 +0000 (13:38 -0700)]
ieee80211-radio: Fix description of packet start and end time fields

Change-Id: I8b0acaa689c468b6da553d47a15a9d47fe9d45a6
Reviewed-on: https://code.wireshark.org/review/22021
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years agoWiX: Switch to Visual Studio 2015.
Gerald Combs [Wed, 7 Jun 2017 19:37:44 +0000 (12:37 -0700)]
WiX: Switch to Visual Studio 2015.

The Windows builders now use Visual Studio 2015.

Change-Id: I0fe4defd090930a0b8531e544d03ad4f3b36dac1
Reviewed-on: https://code.wireshark.org/review/22018
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 316d09a5aee68904ba0348c2017647b4dea3aab1)
Reviewed-on: https://code.wireshark.org/review/22019

6 years agoepl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Wed, 7 Jun 2017 10:42:19 +0000 (12:42 +0200)]
epl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Id5dde66c6473cd7ba3c7cc981d7b86f564f7ca9f
Reviewed-on: https://code.wireshark.org/review/22004
Reviewed-by: Ahmad Fatoum <ahmad@a3f.at>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoFP: Comments fixes
Darien Spencer [Wed, 7 Jun 2017 04:07:00 +0000 (21:07 -0700)]
FP: Comments fixes

Minor comments changes

Change-Id: I71fb37ee20cf10b03beb5c805c5e63aed016d8ab
Reviewed-on: https://code.wireshark.org/review/22010
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoepl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Wed, 7 Jun 2017 10:35:48 +0000 (12:35 +0200)]
epl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Id8e5c3622f5186fcab530b9d329a0ff1d42bd6f3
Reviewed-on: https://code.wireshark.org/review/22002
Reviewed-by: Ahmad Fatoum <ahmad@a3f.at>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agorsl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Wed, 7 Jun 2017 10:01:12 +0000 (12:01 +0200)]
rsl: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I0ab6056a5241c53dba8b569905e29a9ab9d9f265
Reviewed-on: https://code.wireshark.org/review/22001
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Piotr Tulpan <piotr.tulpan@netscan.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoRANAP: prevent heuristic dissector from adding info to tree or triggering exception
Pascal Quantin [Wed, 7 Jun 2017 12:18:52 +0000 (14:18 +0200)]
RANAP: prevent heuristic dissector from adding info to tree or triggering exception

Bug: 13770
Change-Id: I6ba5dfb5098ea1a4d4d1e2d740382326c7d58f8c
Reviewed-on: https://code.wireshark.org/review/22006
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Ivan Nardi <nardi.ivan@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoCoAP: added new TLV code 11542 according to changes in LwM2M OMA Spec.
Anton Butenko [Wed, 7 Jun 2017 10:07:04 +0000 (13:07 +0300)]
CoAP: added new TLV code 11542 according to changes in LwM2M OMA Spec.

Bug: 13761
Change-Id: I3cd5bca6e6959aeb74bf3ae8141c3b2afa70e028
Reviewed-on: https://code.wireshark.org/review/21999
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>
6 years agoQt: Wireless Timeline improvements
Stig Bjørlykke [Wed, 7 Jun 2017 08:08:46 +0000 (10:08 +0200)]
Qt: Wireless Timeline improvements

- Change keyboard shortcuts to Ctrl+Shift+[IOU]
- Use UTF8_MICRO_SIGN in tooltip text
- Change 0xffffffffffffffff with G_MAXUINT64
- Check for valid wlan_radio *ri before use
- Small whitespace cleanups

Change-Id: I9fa85c0d675ef3837510afaf5f1b723d89ac134c
Ping-Bug: 13769
Reviewed-on: https://code.wireshark.org/review/21993
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Simon Barber <simon.barber@meraki.net>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years agoMIP: Add decoding of Mobile Network Extensions (RFC5177)
Marius Paliga [Tue, 6 Jun 2017 06:03:19 +0000 (08:03 +0200)]
MIP: Add decoding of Mobile Network Extensions (RFC5177)

Change-Id: Ia657e7ad5c8d507aeec74ce815568e6e44137d70
Reviewed-on: https://code.wireshark.org/review/21975
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoumts_fp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Wed, 7 Jun 2017 09:58:23 +0000 (11:58 +0200)]
umts_fp: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Iae6425704cdd72476bcadf9912564dc162684ef5
Reviewed-on: https://code.wireshark.org/review/22000
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoCQL: add an expert info when a list count is negative
Pascal Quantin [Tue, 6 Jun 2017 19:24:52 +0000 (21:24 +0200)]
CQL: add an expert info when a list count is negative

Bug: 13764
Change-Id: Ied78911c7089c9b7ca50d4df0e478cd4946af372
Reviewed-on: https://code.wireshark.org/review/21988
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Benoît Canet <benoit@scylladb.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoieee80211: Explain TSF in wlan_radio.timestamp blurb
Stig Bjørlykke [Wed, 7 Jun 2017 06:57:44 +0000 (08:57 +0200)]
ieee80211: Explain TSF in wlan_radio.timestamp blurb

Also exchange 0xFFFFFFFFFFFFFFFF with G_MAXUINT64.

Change-Id: Ie9ecca6268afc1788ce79015295b706350490476
Reviewed-on: https://code.wireshark.org/review/21990
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years agoprofinet: use proto_tree_add_item_ret_(u)int directly
Martin Kaiser [Wed, 7 Jun 2017 05:06:50 +0000 (07:06 +0200)]
profinet: use proto_tree_add_item_ret_(u)int directly

Profinet defined functions to add 32bit integers to the tree and get their
value. This is equivalent to proto_tree_add_item_ret_(u)int. Call those
functions directly and remove the now obsolete Profinet functions.

In some cases, the returned 32bit value is discarded. Use
proto_tree_add_item then.

Change-Id: I7744fab2f27b8ae8e681a36e4e96eb2f8be87bd6
Reviewed-on: https://code.wireshark.org/review/21989
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
6 years ago[Ranap] Heuristic: update to the current highest ProcedureCode id
Ivan Nardi [Tue, 6 Jun 2017 15:19:27 +0000 (17:19 +0200)]
[Ranap] Heuristic: update to the current highest ProcedureCode id

Change-Id: Ib17b5db42717d92dfd139d56b947166fddc29c5b
Reviewed-on: https://code.wireshark.org/review/21986
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>
6 years agoprofinet: use proto_tree_add_item_ret_(u)int
Martin Kaiser [Mon, 5 Jun 2017 14:14:01 +0000 (16:14 +0200)]
profinet: use proto_tree_add_item_ret_(u)int

profinet has a number of internal functions that add an item to the tree
and read its value. For 32bit integers, this is exactly what
proto_tree_add_item_ret_(u)int do. Just call those functions.

(We could do the same for 8 and 16bit values. We'd need a temporary
value then and the code wouldn't be much easier than it is now.)

Change-Id: I98fc70ced2dc5a552235a476d40a4275f3b3bd38
Reviewed-on: https://code.wireshark.org/review/21965
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
6 years agoepl: fix code will never be executed [-Wunreachable-code]
Alexis La Goutte [Tue, 6 Jun 2017 13:34:47 +0000 (13:34 +0000)]
epl: fix code will never be executed [-Wunreachable-code]

false positive when declare variable after a switch(){

Change-Id: Ief4770b2200a356b061cf84c7828c8ebe76a1fbb
Reviewed-on: https://code.wireshark.org/review/21983
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>
6 years agoepl: fix no previous prototype for function 'profile_load' [-Wmissing-prototypes]
Alexis La Goutte [Tue, 6 Jun 2017 13:22:21 +0000 (13:22 +0000)]
epl: fix no previous prototype for function 'profile_load' [-Wmissing-prototypes]

Change-Id: I5c3119436984cc7de3dcf4dffd1961481cacc553
Reviewed-on: https://code.wireshark.org/review/21982
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agonetflow/cflow: fix hf conflict
Alexis La Goutte [Tue, 6 Jun 2017 13:54:45 +0000 (13:54 +0000)]
netflow/cflow: fix hf conflict

'cflow.pie.ntop.retransmitted_out_bytes' exists multiple times with NOT compatible types: FT_IPv6 and FT_UINT32

Change-Id: I9caed4c28a5e8322008b4cae4f625a681343a136
Reviewed-on: https://code.wireshark.org/review/21984
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>
6 years agoFP - Resolve U-RNTI for HS-DSCH & E-DCH
Darien Spencer [Tue, 6 Jun 2017 03:23:43 +0000 (20:23 -0700)]
FP - Resolve U-RNTI for HS-DSCH & E-DCH

Use U-RNTI resolving logic applied to DCH for HS-DSCH and
E-DCH as well.

Change-Id: I1b2b6f6d4c7e2a46fb8208b7134aa62e86512938
Reviewed-on: https://code.wireshark.org/review/21977
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoFP - Fix missing TFI bitmask
Darien Spencer [Tue, 6 Jun 2017 20:14:56 +0000 (13:14 -0700)]
FP - Fix missing TFI bitmask

Parsing of the TFI field was not ignoring the 3 leftmost bits.
Also updated the comment explaining his mask.

Change-Id: I98d6ab9bdec3ce4a8640ece560a467ddbd5b8d42
Reviewed-on: https://code.wireshark.org/review/21978
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: Pascal Quantin <pascal.quantin@gmail.com>
6 years agoepl (profiler-parser): fix parameter 'cmp/allocator' not found in the function declar...
Alexis La Goutte [Tue, 6 Jun 2017 11:15:03 +0000 (11:15 +0000)]
epl (profiler-parser): fix parameter 'cmp/allocator' not found in the function declaration [-Wdocumentation]

Change-Id: I76a7c66fd4d1872b5cc63447b5acfac2ab8821fd
Reviewed-on: https://code.wireshark.org/review/21981
Reviewed-by: Roland Knall <rknall@gmail.com>
6 years agorsa.h: include <stdio.h>
Michael Mann [Tue, 6 Jun 2017 11:51:19 +0000 (07:51 -0400)]
rsa.h: include <stdio.h>

Pacify OS/X buildbot

Change-Id: Icbf49b747473adfa16c1a08c81489b68a88d9a93
Reviewed-on: https://code.wireshark.org/review/21979
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoFP - Added "Missing PI bitmap" warning
Darien Spencer [Tue, 6 Jun 2017 04:04:58 +0000 (21:04 -0700)]
FP - Added "Missing PI bitmap" warning

Added an expert field warning the user if a PI bitmap was not found for a PCH frame.

Change-Id: Id9d0461f6528b767da0058eba844617e5bbb1d6e
Reviewed-on: https://code.wireshark.org/review/21972
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>
6 years agossl-utils: Build with -Wshorten-64-to-32
Stig Bjørlykke [Tue, 6 Jun 2017 06:41:45 +0000 (08:41 +0200)]
ssl-utils: Build with -Wshorten-64-to-32

[...]/wireshark/epan/dissectors/packet-ssl-utils.c:3556:7: error: implicit
   conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'gint'
   (aka 'int') [-Werror,-Wshorten-64-to-32]
     i=rsa_decrypt_inplace(encrypted_pre_master->data_len,
      ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: I1bfdef1bfa451f5098bc6c12c1b4cc57c7de4fdd
Reviewed-on: https://code.wireshark.org/review/21976
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
6 years agoCleanup DRDA dissector
Michael Mann [Mon, 5 Jun 2017 03:33:43 +0000 (23:33 -0400)]
Cleanup DRDA dissector

1. Call "main" dissector from heuristic dissector so tcp_dissect_pdus
can be used.
2. Let tcp_dissect_pdus do its job and be the "loop logic"
3. Column API simplification
4. Use proto_tree_add_item_ret_uint

Change-Id: Ic53fd6b20daa8153cdf22f8aadf53dbdd24334bf
Reviewed-on: https://code.wireshark.org/review/21958
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
6 years agoMove RSA key loading and decryption functions to wsutil
Ahmad Fatoum [Wed, 26 Apr 2017 05:33:25 +0000 (07:33 +0200)]
Move RSA key loading and decryption functions to wsutil

Loading PEM and PKCS#11 keys was being done in static functions
in packet-ssl-utils.c. These were moved to wsutil, with prototypes
in a new <wsutil/rsa.h> header. This adds gnutls as optional
dependency to wsutil.

The RSA decryption helper was also moved and is now provided in
<wsutil/wsgcrypt.h>.

This allows more dissectors to access this functionality.

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