Commit Graph

79952 Commits

Author SHA1 Message Date
Caleb Chiu 6581899a84 NCSI: Squash commits of NCSI and PCI-IDS
NCSI: Extends NCSI dissection based on DSP0222 Version: 1.2.0_2b

Add pci-ids.c and pci-ids.h for mapping PCI IDs(VID,DID,SID,SVID) to string.
Extends NCSI dissection to support DSP0222 Version: 1.2.0_2b.
Extends NCSI dissection to support Mellanox OEM commands.

NCSI: Use TFS for boolean mapped string and added AEN dissectors

1. Use the tfs defined in tfs.c
2. Refine the boolean mapped strings to be TFS style
3. Added dissectors for AEN

NSCI: Fixed erros with gcc 7.5.0

1. Fix compiling errors with gcc 7.5.0 under Ubuntu 18.04
2. Sloved complaints of git pre-commit hook

NCSI: Add "0x" prefix for displaying HEX values

There are codes display HEX values without prefix, added "0x" to fix that.

PCI-IDS: Added PCI ID file and python script to convert it to C codes

1. Added the PCI ID file pci.ids from https://pci-ids.ucw.cz/
2. Added pci-ids-convert.py to convert to epan/dissectors/pci-ids.c

PCI-IDS: Updated the PCI ID list to be Version 2021.01.11

NCSI: Remove trailing spaces and unused href entries

PCI-IDS: Use a fresh copy of pci.ids to generate pci-ids.c

1. Renamed pci-ids-convert.py to make-pci-ids.py
2. make-pci-ids.py uses a fresh copy of pic.ids to generate pci-ids.c

PCI-IDS: Move internal structure to C file

1. Move pci_id_t and pci_vid_index_t from header file to C file.
2. Refined the comments of pci-ids.c
3. Renamed local variable index (shadow variable) to idx

PCI-IDS: Refined binary search codes

PCI-IDS: Moved pci-ids.[ch] to epan/

Moved pci-ids.[ch] to epan/ as they ought to be
2021-02-17 07:10:31 +00:00
Guy Harris 3ad7f90a96 CMake, GitLab CI: forcibly unset CMAKE_VERBOSE_MAKEFILE if requested.
Forcibly unset the cached version of CMAKE_VERBOSE_MAKEFILE if the
FORCE_CMAKE_NINJA_NON_VERBOSE environment variable is set, to make
*extra* sure that we don't do a verbose build.
2021-02-16 13:23:46 -08:00
Gerald Combs fa15eb8f5d CMake: Add a note about setting CAExcludePath.
Visual Studio's code analyzer lets you avoid analyzing external headers
using CAExcludePath. Add a note suggesting that we might want to do this
using the VS_USER_PROPS CMake property, but that for now we're using an
environment variable in the builder config.
2021-02-16 11:04:35 -08:00
Guy Harris 9ffb0f27c8 GitHub CI, CMake: override the definition of cmake_build.
Overriding the definition of the rpmbuild macro cmake_build on the
command line, so that it doesn't include the string "--verbose", should
prevent cmake --build from being run with --verbose, and thus prevent it
from running Ninja with the -v flag, and thus prevent a bunch of extra
noisy output from being produced for every build command, and thus
prevent the build log from hitting GitLab's 4MB limit.

Unlike piping the output of "ninja rpm-package" to sed, this means that
the exit status of "ninja rpm-package", rather than the exit status of
sed, is tested.
2021-02-16 09:00:12 +00:00
David Perry 23a5f6a177 Support Van Jacobson PPP compression (#12138)
A complete dissector for Van Jacobson PPP header compression:
<ftp://ftp.rfc-editor.org/in-notes/rfc1144.pdf>

This dissector was created solely by reading the description of the
protocol in section 3.2 of RFC 1144. In particular, I did *not* read the
sample implementation of the RFC in its Appendix A, due to the
questionable legality of using code with "All rights reserved" in
Wireshark. See #12138 for details.

Closes #12138.
2021-02-16 08:44:41 +00:00
John Thacker 20ab1ba46b HNBAP: Break out MCC and MNC from PLMNidentity 2021-02-15 19:39:06 -05:00
Guy Harris 2a1de77c72 GitLab CI: *both* commands to sed need a -e flag. 2021-02-15 15:29:53 -08:00
Guy Harris 2e9303b7b2 GitLab CI: use sed to strip out -W and -f options from output.
Filter out the -W and -f options from the output of "ninja rpm-package",
to try to cut down the verbosity.

Do that instead of passing --quiet to rpmbuild, so we get command
progress messages, just without the extra junk.
2021-02-15 14:31:14 -08:00
Guy Harris 0ed0ab665f CMake: the argument to rpmbuild to quiet it is --quiet, not -q. 2021-02-15 12:56:31 -08:00
Gerald Combs e29c934d72 NVMe Fabrics RDMA: Initialize a variable.
Make sure q_ctx is fully initialized. Fixes #17233.
2021-02-15 10:28:57 -08:00
Alexis La Goutte ef03a3b4ea ieee80211: Fix dissection of NonTransmitted BSSID Capability when include on nonTransmitted BSSID IE
There is only Capability Information
2021-02-15 15:47:50 +00:00
Tomasz Moń ecaf1897aa Qt: Do not use obsolete functions
QDateTime to/from Time_t functions are deprecated in favor of 64-bit
to/from seconds since epoch introduced in Qt 5.8.

QLayout::setMargin() is deprecated in favor of setContentsMargin().
2021-02-15 15:22:55 +01:00
Guy Harris 4b22f71f76 CMake, .gitlab-ci.yml: try to cut down the output for Fedora RPM builds.
If the FORCE_CMAKE_NINJA_QUIET environment variable is set, have the
top-level CMakeLists.txt add the -q flag to the arguments to rpmbuild.
That appears to reduce the amount of output.

Set that environment varible in the rpm-fedora build.
2021-02-15 02:21:12 -08:00
Guy Harris 812c9f5b81 rpm-setup, WSDG: add a --install-rpm-deps option to install rpm-build.
This matches what deb-setup does - it has an --install-deb-deps optionto
install tools necessary to build a .deb.

Document it in the WSDG while we're at it.
2021-02-15 09:48:51 +00:00
Martin Mathieson 11e919898c Set a few more dissector vars/funs to static.
These are the last of the easy ones to fix/set.
2021-02-15 09:20:58 +00:00
Martin Kaiser 909bb0a012 dvb-ci: initial support for auxiliary file system resource
The Auxiliary File System Resource was added by the DVB-CI+ specification
v1.4. As a first step, this patch adds the framework for supporting the afs
resource and dissects two simple APDUs.

This is based on work by Jens Rosenboom.
2021-02-15 09:04:52 +00:00
Gerald Combs e99c9afce8 Be more strict about opening URLs.
In the proto tree, copy URLs instead of opening them.

In the export dialog, enable previews only if the advertised MIME type
*and* the contents of the file are plain text, GIF, JPEG, or PNG.

Add warnings to the wslua browser_open_url and browser_open_data_file
documentation.

Fixes #17232.
2021-02-15 08:47:57 +00:00
Gerald Combs 270c8ed746 CMake: Make sure system headers are treated as such.
Use target_include_directories instead of include_directories in a few
places as recommended at

https://cmake.org/cmake/help/latest/command/include_directories.html

Doing so lets us mark a bunch of dependency includes SYSTEM PRIVATE, in
particular LIBXML2_INCLUDE_DIRS. On macOS this keeps us from triggering
the nullability warnings described at

https://www.wireshark.org/lists/wireshark-dev/202004/msg00056.html

(This might also keep the Visual Studio code analyzer from complaining
about various Qt headers, but I haven't tested this.)
2021-02-15 08:31:08 +00:00
Guy Harris 3c404abf2c rpm-setup: install libgcrypt by default.
Wireshark now requires it.
2021-02-15 08:14:14 +00:00
Chuck Craft dde65b96cd ip: ip_ttl _ws.expert fields not set if no tree
See 'if (tree) ...' comment
Closes #17228
2021-02-15 07:33:39 +00:00
Chuck Craft 996bdc37bf WSDG/WSUG: Bugzilla->Gitlab Issues; bad MATE link
Bugzilla references are now Gitlab Issues.
Link to MATE tutorial page on Wiki to get config file.
2021-02-15 06:46:11 +00:00
Martin Mathieson 7f2ad0b7d1 IEEE8022.11: Fix some spellings. 2021-02-15 06:29:01 +00:00
Guy Harris de4cd04e60 gitlab-ci: try to make the RPM build less noisy.
See whether unsetting VERBOSE causes the build process not to print the
compile command, complete with a big list of compiler options, for every
single file being built, in the hopes of producing less than the limit
of 4MB of log text.
2021-02-14 21:07:53 -08:00
Guy Harris 2e4ea72f51 gitlab-ci: try to make the Debian build less noisy.
See whether setting DH_QUIET to 1 and MAKEFLAGS to --silent causes the
build process not to print the compile command, complete with a big list
of compiler options, for every single file being built, in the hopes of
producing less than the limit of 4MB of log text.
2021-02-14 18:48:00 -08:00
Guy Harris c0711693ab Enable -Wredundant-decls.
Add it to the default list of checks, and fix some errors it causes.
(Sadly, it doesn't work in CLang.)
2021-02-14 14:43:42 -08:00
Guy Harris 3387eef836 wiretap: remove duplicate declaration of wtap_block_get_type(). 2021-02-14 20:06:21 +00:00
Martin Mathieson 0cf834f909 Make some more variables and functions static. 2021-02-14 19:42:01 +00:00
Martin Mathieson e727d6f838 PDCP: set key error strings with g_strdup_print) 2021-02-14 15:00:19 +00:00
Gerald Combs 20bc017ba5 [Automatic update for 2021-02-14]
Update manuf, services enterprise numbers, translations, and other items.
2021-02-14 12:03:40 +00:00
Guy Harris b8b3531883 wiretap: register most built-in file types from its module.
Remove most of the built-in file types from the table in
wiretap/file_access.c and, instead, have the file types register
themselves, using wtap_register_file_type_subtypes().

This reduces the source code changes needed to add a new file type from
three (add the handler, add the file type to the table in file_access.c,
add a #define for the file type in wiretap/wtap.h) to one (add the
handler).  (It also requires adding the handler's source file to
wiretap/CMakeLists.txt, but that's required in both cases.)

A few remain because the WTAP_FILE_TYPE_SUBTYPE_ #define is used
elsewhere; that needs to be fixed.

Fix the wiretap/CMakefile.txt file to scan k12text.l, as that now
contains a registration routine.  In the process, avoid scanning files
that don't implement a file type and won't ever have a registration
routine.

Add a Lua routine to fetch the total number of file types; we use that
in some code to construct the wtap_filetypes table, which we need to do
in order to continue to have all the values that used to come from the
WTAP_FILE_TYPE_SUBTYPE_ types.

While we're at it, add modelines to a file that lacked them.
2021-02-14 00:58:46 -08:00
Guy Harris 5b3c3d0682 WSDG: deprecate wtap_filetypes.
Recommend the use of wtap_name_to_file_type_subtype() to get filetype
values, unless you need to run on older versions of Wireshark that don't
have it.

Don't even *mention* wtap_filetypes in the documentation for the new
wtap_ routines, as, if you have those routines, you have
wtap_name_to_file_type_subtype(), because it's one of those routines.

Fix references to "nul" while we're at it - it's "nil" in Lua.

(That part of the WSDG - the Lua reference - is generated, so this
involves changing the source code implementing the Lua routines.)
2021-02-13 22:12:23 -08:00
Guy Harris 8ec5906fd6 iseries: report Unicode files as Unicode rather than ASCII.
While we're at it, that's "Unicode", not "UNICODE" - it's not an
initialism, and isn't all-caps.
2021-02-13 20:23:08 -08:00
Alexis La Goutte 63d802099a ieee80211: Update Reference 2021-02-13 19:48:30 +00:00
Guy Harris 8bba6ebe5c wiretap: remove spaces from file format names.
File format names are used on the command line, so don't require them to
be quoted - replace the space in "systemd journal" with an underscore.
2021-02-13 10:35:58 -08:00
ferst 8037be0ef6 Modbus/TCP: Add TLS dissector
In 2018 Modbus Organization published a document named
"Modbus/TCP Security"[1] that specifies the use of Modbus/TCP over TLS.
This commit register a new dissector, "mbtls", reusing "mbtcp" proto. A
new option is added to define the Modbus/TLS port to be use in
`classify_mbtcp_packet`.

[1] https://modbus.org/docs/MB-TCP-Security-v21_2018-07-24.pdf
2021-02-13 17:44:12 +00:00
Nardi Ivan afeb15d4d8 QUIC: add support for more QUIC versions
See: https://github.com/quicwg/base-drafts/wiki/QUIC-Versions
2021-02-13 16:24:54 +00:00
Harald Welte 5d38347128 bssgp: Set in_error_pkt
Whenever we receive a BSSGP message indicating an error, set
in_error_pkt accordingly.  This will prevent higher layer dissectors
from clearing COL_INFO.
2021-02-13 15:46:32 +00:00
Harald Welte 318d86852d gprs-ns: Mark NS-STATUS as in_error_pkt
Like many transport protocols, NS has the ability to include
the "erroneous message" when reporting errors to its peer in
NS-STATUS PDUs.

The current UX however is super annoying:  The BSSGP dissector
clears COL_INFO and hence if you look at the packet list in wireshark,
it looks like a valid higher-layer message is transmitted over NS,
and there is no mention that this is an error (NS-STATUS).

By simply setting in_error_pkt, the behavior changes: The erroneous
message is still dissected in the protocol details, but COL_INFO
remains what the NS decoder has to say: NS-STATUS with a decoded
cause information.
2021-02-13 15:46:32 +00:00
David Fort 5260be8ab6 rdp: add Restricted authentication mode flags dissection
Dissect the Restricted authentication mode flags in RDP_NEG_RSP packets according to
MS-RDPBCGR 2.2.1.2.1
2021-02-13 14:51:32 +00:00
Guy Harris 24acef0885 wiretap: file types have a name and a description.
The "short name" is really just the name, used to look it up.  The
"name" is really a description intended solely for human consumption.
Rename the fields, and the functions that access them, to match.

The "description" maintained by Lua for file type handlers is used
*only* for one debugging message; we should probably just eliminate it.
Call it an "internal description" for now.
2021-02-13 01:25:39 -08:00
Guy Harris 28dbff322b WSDG: add UN*X targets for building packages. 2021-02-12 22:25:31 -08:00
Guy Harris f0ebc50762 wslua: expose some libwiretap APIs in Lua.
Provide Lua version of wtap_file_type_subtype_string(),
wtap_file_type_subtype_short_string(), and
wtap_short_string_to_file_type_subtype().

This will be backported to the 3.2 and 3.4 branches, to allow scripts
not run on the bleeding-edge version to use them.
2021-02-12 21:25:29 -08:00
Guy Harris b67494e32a WSDG: give more details on setting up a UNIX build environment.
List the minimum set of tools required.

We have scripts to do the setup work on a number of platforms.  Let the
user know about them.

Give instructions on using CMake; we're not using the traditional
autoconf stuff any more.

Give instructions on building the Developer's and User's Guides in the
UNIX section, and, in both that section *and* the equivalent Windows
section, give the name of the build target for building all guides.
2021-02-12 15:00:07 -08:00
Jaap Keuter b9bdc803bb ASTERIX: fix dissection of I010_041 and I010_042 fields
Fixes #17226
2021-02-12 14:20:53 +01:00
Pascal Quantin af119730e6 ISKAMP: fix a REPORT_DISSECTOR_BUG printf 2021-02-12 12:06:35 +01:00
Constantine Gavrilov 4c328749ac NVME RDMA dissector: add decoding of RDMA payload for connect command. 2021-02-12 10:57:27 +02:00
Constantine Gavrilov 7246677d42 NVME RDMA dissector: store RDMA transfers and link them to commands.
Details:
* At this point works for single RDMA transfer per command
* Commands are linked to RDMA requests
* RDMA requests are linked to commands (read and only first write)
* RDMA read requests are linked to read responses (only first response)
* RDMA read responses are linked to requests (only first response)
* RDMA read responses are linked to commands (only first response)
2021-02-12 10:57:27 +02:00
Constantine Gavrilov aea7f6fad2 NVME RDMA dissector: decode Property Get/Set structures. 2021-02-12 10:56:03 +02:00
Constantine Gavrilov bfa2ae5964 Revert "NVME RDMA dissector: store RDMA transfers and link them to commands."
This reverts commit 05d5506324.
Due to a wrong order of merge requests, and squashing the history,
I would like to split the commit into two independent changes.
2021-02-12 10:52:12 +02:00
Alex Nik c361d31843 added the description about the 29West stat menu 2021-02-12 07:48:51 +00:00