Commit Graph

72542 Commits

Author SHA1 Message Date
João Valverde 5e9d1e4e65 CMake: Change installation path for modules
This is one of the CMake standard paths on Unix and avoids polluting the
$libdir/wireshark folder.

Change-Id: I6e5fd81e95b52e585e92306aca18dfb2426668ca
Reviewed-on: https://code.wireshark.org/review/29255
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2018-08-24 14:39:08 +00:00
Anders 7b7f0e81f9 GTP: Refactor dissection of T-PDU and adding of PDCP data
Change-Id: I9548ec85a351f8682a8a7d89f43c6dbd20cfe66d
Reviewed-on: https://code.wireshark.org/review/29271
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-24 11:17:16 +00:00
Martin Boye Petersen 6c836f7b95 zbee-se-publish-block-period: block duration & block duration type
The duration is 24bit but the offset is only incremented by 1.
Also show the duration type the same way for both publish billing period
and publish block period.

Change-Id: Ia5e147226dad7e25d6f38aede2ef3b0801263ad2
Reviewed-on: https://code.wireshark.org/review/29266
Reviewed-by: Kenneth Soerensen <knnthsrnsn@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-24 10:55:49 +00:00
Vasil Velichkov cdb1123b9a rawshark: Free pipe name and version info strings
The comp_info_str and runtime_info_str are always allocated but were
only freed when the -v parameter is specified.

../test/util_dump_dhcp_pcap.py raw | valgrind --tool=memcheck --leak-check=full \
    run/rawshark -r - -n -dencap:1 -R "udp.port==68"

Change-Id: I6e641ae1dbb428e4dd29c2027f6a4b2305e7bcaa
Reviewed-on: https://code.wireshark.org/review/29269
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-24 08:54:19 +00:00
Darien Spencer 3ba67f735d AT: Add CSQ command
Change-Id: I8e795710b04f9421e9b847f800f35552af46fa67
Reviewed-on: https://code.wireshark.org/review/29258
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-24 07:13:57 +00:00
Andrey 2a7320b647 Fix Usb HID Report descriptor Local item Usage parsing
Add usage values taken from "HID Usage Tables 1.12".
Fix Global item Usage Page and Local item Usage concatenation.

Change-Id: Ifeb09b60875460bd4bea0641dfa932479ffe6bbf
Reviewed-on: https://code.wireshark.org/review/29253
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-24 07:10:56 +00:00
Darien Spencer 78d7a1d3f7 AT: Clarify that a DCE is a Modem
Change-Id: I0216a67bc5a99877efc972d21e777c97c46546f5
Reviewed-on: https://code.wireshark.org/review/29267
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-24 03:53:28 +00:00
Swapnil Roy 9e3b26b289 NAS 5GS: PDU session status fix
Change-Id: I723c0003fb41211580df8d57c4705acfa421189d
Reviewed-on: https://code.wireshark.org/review/29268
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-08-23 15:54:21 +00:00
slavka a9e7bda136 GTPV2: Extended Macro eNB ID was not assigned to correct type of subtree
Change-Id: I51446af504a5cac1b8917e06d899b4aec51d02be
Reviewed-on: https://code.wireshark.org/review/29265
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-08-23 13:43:48 +00:00
Stig Bjørlykke a9feb0ea29 Qt: Enable select hint text in Show Packet Bytes
The hint label in Show Packet Bytes shows information about the selected
field, and the user should be able to select this text using the mouse.

Change-Id: Ic969dbd07cb1fcd61d0e8f777692523a0fc5850b
Reviewed-on: https://code.wireshark.org/review/29259
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-08-23 12:18:09 +00:00
slavka c0b81e01d9 GTPV2: added support for Extended Macro eNodeB
Added support for Extended Macro eNodeB field in Presence Reporting
Area Action. Defined in 29.274 sec 8.51.5.

Change-Id: I27242b38c03cea4c1284c14d42b0d3f54da710f4
Reviewed-on: https://code.wireshark.org/review/29245
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-08-23 10:48:24 +00:00
Martin Mathieson f5c1c1935c DCT2000: For LTE MAC, set flag to say whether sf/sfn present or not
Change-Id: Id11866fd90e69a0185a8095a82fab5fbc44c92ae
Reviewed-on: https://code.wireshark.org/review/29260
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-08-23 10:11:31 +00:00
João Valverde f0b41190eb CMake: Clean up and homogenize plugin dir configuration
Change-Id: If43c7b124afdf6471164675f8a0c55a76e998ea1
Reviewed-on: https://code.wireshark.org/review/29254
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2018-08-23 08:33:56 +00:00
Stig Bjørlykke 0c0973196f WSUG: Remove duplicate Clear button description
Change-Id: Id7f468de1c08361ed919d1b3715966c589801d6f
Reviewed-on: https://code.wireshark.org/review/29257
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-08-23 07:53:23 +00:00
Martin Kaiser 331ec14948 ppp: remove a number of unnecessary NULL checks
Change-Id: Iaa40faf7c2dc4f195d1479d689fee471c8b5ddb8
Reviewed-on: https://code.wireshark.org/review/29252
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-23 04:07:37 +00:00
Mouscher, Daniel [Intern] cefa533ec2 MAC-LTE: Display timing info on SR frames when present
Change-Id: Ibbcd756913e0cf0592bc66b102a2bb7846c38ddd
Reviewed-on: https://code.wireshark.org/review/29249
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-08-22 23:01:04 +00:00
João Valverde 3b17e66b78 Revert "IP: Use pinfo for session IP addresses"
This reverts commit bb25d64a2a.

Change-Id: I8b790ee8371a7257696a21fe99ed483c892b8baf
Reviewed-on: https://code.wireshark.org/review/29251
Reviewed-by: João Valverde <j@v6e.pt>
2018-08-22 18:10:22 +00:00
slavka eda834b6e2 Diameter: add enum value to Presence-Reporting-Area-Status AVP
Change-Id: Ic06a944642e3b01c8bfa38b427f4d5d615f762e0
Reviewed-on: https://code.wireshark.org/review/29246
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-08-22 13:02:23 +00:00
Anders 2e8de47f57 Diameter: Add Commands and AVPs from 3GPP TS 29.338
Change-Id: I831ccc2aed6b8eff2e9047f84daa8b8034e84a7f
Reviewed-on: https://code.wireshark.org/review/29243
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-22 08:51:11 +00:00
Adam Morrison 11b3663004 Fixed a bug related to epan initialization
In various places, <program>_epan_new was called before setting the
provider, so the wth field was null. This fix is necessary for the
next commit, adding Secrets Description Block, as it uses this field.

Change-Id: Ice8ee01c56b3e04fc71d7b2c659d9635cb366951
Reviewed-on: https://code.wireshark.org/review/28868
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-22 06:18:11 +00:00
João Valverde bb25d64a2a IP: Use pinfo for session IP addresses
The pinfo structure is sufficent for providing the src/dst address.
The pinfo address data is strictly the same as the tap data, even for
IP over IP.

Besides the trivial code simplification we prioritize the use of pinfo
over a tap, for increased type-safety and on the presumption of having
a more stable implementation (in the mutability sense).

Change-Id: Idcfc8c762f9af934e4612522b7472b35a01042ca
Reviewed-on: https://code.wireshark.org/review/29238
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-22 05:01:43 +00:00
Gerald Combs ca355b8905 WSDG: Miscellaneous fixups.
Change occurrences of GIT to Git. Fix a couple of URLs. Other changes.

Change-Id: I9eb69ee16f692c2bf71b62e7a2db4b762d9ab4bf
Reviewed-on: https://code.wireshark.org/review/29237
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-22 04:07:40 +00:00
Stig Bjørlykke a6a915abcc Qt: Enable "Resolve Names" for boolean without TFS
Boolean field types will default to tfs_true_false if not having
a TFS set, so this should always be enabled for resolve.

Remove FT_FRAMENUM from this check because they will probably never
have a TFS or VALS setting.

Change-Id: I6295f8b7c9db7295eab1750e9c2cf0ee7382d43d
Reviewed-on: https://code.wireshark.org/review/29218
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-22 03:58:16 +00:00
Anders c57a52f68c UAT: HEX Values should be allowed the full uint32 range e.g allow 0xffffffff
Change-Id: I13ec13646271bd9de543d02de5c7cbc0d6d02019
Reviewed-on: https://code.wireshark.org/review/29219
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-22 03:57:55 +00:00
João Valverde 7d76d0ce28 Revert "CMake: Clean up plugin dirs"
Broke system (global) binary plugin path.

This reverts commit 450ff674a6.

Change-Id: I5353d2f3acf4450aed243040ef71425a71542a08
Reviewed-on: https://code.wireshark.org/review/29240
Reviewed-by: João Valverde <j@v6e.pt>
2018-08-22 00:49:16 +00:00
Gerald Combs 60e87794c4 WSUG: Update the main and filter toolbar sections.
Update the images and text to match the current main and display filter
toolbars.

Change-Id: I4d23a3ece35c3b9186b4fff170f6c391f4d157c9
Reviewed-on: https://code.wireshark.org/review/29234
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-08-21 23:13:11 +00:00
João Valverde 6b9beb6ca1 Fix comment.
Change-Id: Ib41b9a84333a3d3d34ae9c0797dbae10141f9e53
Reviewed-on: https://code.wireshark.org/review/29235
Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21 23:11:04 +00:00
João Valverde 450ff674a6 CMake: Clean up plugin dirs
Change-Id: Ie41366205db19b8a9714ad5259c3f958e1e9ee95
Reviewed-on: https://code.wireshark.org/review/29233
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21 23:06:38 +00:00
Gerald Combs 2e7cae3fd4 WSUG: Fixup the "Internals" section.
The Internals menu items were moved under the View menu a while back.
Fix an internals dialog title.

Change-Id: I78d61bf4f52bf9eb86cf7ff59fc036b9f7e846f5
Reviewed-on: https://code.wireshark.org/review/29228
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-08-21 22:57:12 +00:00
João Valverde 65d9c473f0 plugins: Minor interface improvement
Change the plugin compatibility check to make it more convenient to
define and check the major.minor Wireshark version.

Change-Id: I2a6d2a746682c29504311cce5c457e0a852c3daf
Reviewed-on: https://code.wireshark.org/review/29224
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21 19:56:12 +00:00
João Valverde 0410a522d5 Regenerate ASN.1 dissectors
Change-Id: I1b7fb95df061e97de2e236d19221b8e2a5da0d92
Reviewed-on: https://code.wireshark.org/review/29226
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21 19:54:12 +00:00
Guy Harris ad3367e169 Use the standard test/[ command.
We use it elsewhere; use it here, as FreeBSD's /bin/sh doesn't support
[[ as a test operator.

Change-Id: I183b10cc6f4aceec9725027474848061e8ea4fd9
Reviewed-on: https://code.wireshark.org/review/29232
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-21 19:21:34 +00:00
Guy Harris e8c3075bb6 Clean up includes for SIOCGIFDESCR.
Change-Id: Ib92f7d85355540cff23f7bb08db911f200541f5f
Reviewed-on: https://code.wireshark.org/review/29231
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-21 19:09:23 +00:00
Guy Harris 1efc9234ea We use errno, so we need to include <errno.h>.
Change-Id: Ic6d88c508594aa9daf36bd0a6a9f2fe4f0db71bd
Reviewed-on: https://code.wireshark.org/review/29230
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-21 19:03:24 +00:00
Guy Harris 5a3c6cb3fc Wrong snprintf() wrapper.
Change-Id: I7d8d83cd1829bed8cc940fa3d9c86cdc94f361af
Reviewed-on: https://code.wireshark.org/review/29229
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-21 19:00:48 +00:00
Guy Harris 15bf0ea437 We need sys/sockio.h to define SIOCGIFDESCR.
Change-Id: Ief8830d7a5ce47ea7f486a4700f49859003519db
Reviewed-on: https://code.wireshark.org/review/29225
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-21 18:57:55 +00:00
João Valverde 319186125c plugins: Fix CMake build example
Fix combination of pkg-config and CMake variables for feature
detection.

Remove non-system installation option. Just copy it manually for now.

Change-Id: Ia80c703c6ec3df0a49f8d56f1bd6da69471c523f
Reviewed-on: https://code.wireshark.org/review/29223
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2018-08-21 17:55:12 +00:00
Anders d99ef1f9fa GTP: Only put "T-PDU" in the top level tree.
Change-Id: I94db5692320daddf67faa5f38f7e132e9edbb2fa
Reviewed-on: https://code.wireshark.org/review/29222
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-21 16:29:20 +00:00
Gerald Combs 6ee559efd1 Fuzz: Reduce the Valgrind packet limit to 10,000.
Limit Valgrind to the first 10,000 packets in each file.

Change-Id: I27be212ddb437c643ffb413bb9d1c809dbe98a55
Reviewed-on: https://code.wireshark.org/review/29210
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-08-21 15:06:48 +00:00
Stig Bjørlykke 4b3745e6ef nordic_ble: Set PHY display type to BASE_DEC
Change-Id: I4a2e2142bbaf08e11a735d125a201c8651cdc857
Reviewed-on: https://code.wireshark.org/review/29217
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-08-21 14:08:35 +00:00
Stig Bjørlykke 04dbbb15c6 Qt: Pop field status when closing a file
Ensure we remove the info status for a selected field when closing
a capture file to bring the text back to "Ready to load or capture".

Change-Id: I2946675b2c0bc47cb8c05c1d391ff8a0875e8c7f
Reviewed-on: https://code.wireshark.org/review/29216
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-21 13:51:35 +00:00
Stig Bjørlykke f435c36423 CMake: Remove a debug message
Remove what appears to be a debug message from CMake.

Change-Id: If6d12ca07d3c3b5f012a7e7ee530f7db18c813e5
Reviewed-on: https://code.wireshark.org/review/29215
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-21 11:04:01 +00:00
Guy Harris ea515c5f2d Don't assume Bash.
At least on my OpenBSD 6.3 VM, there's no Bash installed; just use
/bin/sh.

Fix two places that use csh-style ">& /dev/null" to use
"> /dev/null 2>&1" instead.

Change-Id: I48656c47e89b3ad09f3c2d9e3c90dfad7afabb71
Reviewed-on: https://code.wireshark.org/review/29214
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-21 09:38:24 +00:00
Darien Spencer 5673a58bfa AT: Fix suffix length checks, add no suffix case
Change-Id: I20a7e52635cf95ea1b5d1c85cd0ae6e8619ebff8
Reviewed-on: https://code.wireshark.org/review/29189
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-21 07:26:37 +00:00
Guy Harris 92b4cd586e Fix search for pkg-config on FreeBSD.
1) At least with FreeBSD's "pkg search", the search does *not* do a
prefix match, so if you look for "pkg-config", you can find packages
whose name is *not* pkg-config but that has "pkg-config" in the middle
of the name.  This means that we think we have a "pkg-config" package,
but we don't, and fail when we try to install it.

So we force a prefix match.

2) FreeBSD 11 doesn't have a "pkg-config" packate, but has a "pkgconf"
package.  If we don't find "pkg-config", look for "pkgconf".

Change-Id: Iad5ef9d5630981958830c03e4cb90fe2d01ce1d0
Reviewed-on: https://code.wireshark.org/review/29213
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-21 06:38:45 +00:00
Guy Harris 76ada76427 Remove an unused true_false_string.
The field that used it was removed in
I5092d19b99fc6b9b5c870cafec2990dd67012ab1.

Change-Id: Ia358f475b8fbfeaf1fe10df79e9094ac837e3dd2
Reviewed-on: https://code.wireshark.org/review/29212
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-21 06:26:13 +00:00
Guy Harris 4a5484eaf1 Bash is not guaranteed to be in /usr/pkg/bin/bash.
On my FreeBSD 11 VM, it's the standard FreeBSD package, which installs
it in /usr/local/bin/bash.

Change-Id: Ic6427a88efd963de8909a2d333c2c3bf8586e559
Reviewed-on: https://code.wireshark.org/review/29211
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-08-21 05:02:21 +00:00
Bruno Verstuyft 3d2d1cb31e XRA: Added decoding for SC-QAM TLVs
Change-Id: I40cecd0b6ea0f3d84f36bb6d5fe3dc416c1befff
Reviewed-on: https://code.wireshark.org/review/29196
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-21 04:07:30 +00:00
Johannes Singler d47d445a87 Calculate RTP delta time even if clock rate is unknown.
Change-Id: If61c3166774a25f2c22b68c1e06c372088cae575
Reviewed-on: https://code.wireshark.org/review/29199
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-21 04:06:27 +00:00
ValdikSS 712b2df7c9 Fix SBC packet Loudness/SNR information wrong byte compatison
Change-Id: I05b551ccdbc0630a1d24862e6121d2385c33550e
Reviewed-on: https://code.wireshark.org/review/29198
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-21 04:05:58 +00:00