Commit Graph

86920 Commits

Author SHA1 Message Date
Oliver Smith 5da6e48561 debian: import from Harald's OBS project
Import the debian directory from:
https://obs.osmocom.org/package/show/home:laforge:wireshark/wireshark

This is based on debian unstable's packaging.

Change-Id: I91b0209b8201d3493223fc78c057a6e5c3188cb9
Related: OS#2537
2023-03-13 13:50:32 +01:00
Daniel Willmann 585d240fbe Add AMR codec support
CMake work and rebase on current wireshark master by Harald Welte

Change-Id: I5ec963b910f8f271aa2e5d680ea33e2170a6f367
2023-03-13 13:49:28 +01:00
Oliver Smith 8d000e9e78 === Start of Osmocom specific patches ===
Change-Id: I6d0b1f3dbb7e3c55c84c4104ec6a4b60fa55a420
Related: OS#2537
2023-03-13 13:49:11 +01:00
Martin Mathieson b7f5de4b74 ORAN FH CUS: Change more header field labels to match spec 2023-03-13 09:15:07 +00:00
Gerald Combs d1f8e39782 [Automatic update for 2023-03-12]
Update manuf, services enterprise numbers, translations, and other items.
2023-03-12 19:42:57 +00:00
Tomasz Moń cf0fc59e64
CMake: Fix logray build on Windows
Add missing zlib libraries to logray project to fix linking errors.
2023-03-12 17:45:11 +01:00
Jaap Keuter 9641a960c1 Manpage: dumpcap does not handle predef for capture filters.
Closes #18808
2023-03-12 15:53:21 +00:00
Nicolás Alvarez 5786b3f487 Sort Decode As dissector list case-insensitively
When selecting a dissector in the Decode As dialog box, the combo box of
dissectors is sorted by the ASCII of the dissector description (or protocol
name). That's not very user-friendly because it's case-sensitive; protocols
starting with a lowercase letter appear at the end of the list.

Put the dissectors in a QList and sort the list using localeAwareCompare,
instead of using a QMap and relying on its implicit sorting by key. This
sorts them case-insensitively, and makes it easier for the user to find
protocols in the list.
2023-03-12 15:16:31 +00:00
John Thacker 537b49ee41 Qt: Create Follow Stream menu dynamically
Remove follow_type_t and use proto IDs in its place, since
follow streams are registered via proto ID. Add looking up
registered follow stream types by proto ID, and creating
FollowStreamDialog using proto ID.

Dynamically create the Follow actions based on the registered
follow streams.

Dissectors, including plugins, can now self-contain everything
necessary in order to add follow support (though shortcuts,
overriding the menu name, and special handling for "is the
protocol in the frame" still requires a few manual changes.)

The Conversation (and Endpoints) Dialog no longer need to know
anything special about whether UDP and TCP can be followed.
For example, this means that DCCP streams can automatically be
followed from the Conversation window.
2023-03-12 14:22:46 +00:00
Denis Ovsienko 6365de3983 DECnet: Fix a typo in the DNA header field.
[skip ci]
2023-03-12 13:50:17 +00:00
Harald Welte 450aa4e580 packet-gsm_rlp: Don't read beyond captured length when computing FCS
Fix #18902
2023-03-12 13:20:22 +01:00
John Thacker b911cf286f LISP: Don't go past a LCAF payload length
The LISP Canonical Address Format has a payload length indicator.
Use that to create a payload tvb and don't dissect outside the
payload length. With fuzzed and malformed packets, this was causing
the same bytes to be dissected many times, particularly in the
recursive address types.

A LCAF would be dissected outside the payload region, but then
elsewhere the offset was only advanced by the payload length.

Fix #18900
2023-03-11 15:53:31 +00:00
John Thacker fb5375bf2a wifi-nan: Use wmem_strconcat instead of g_strconcat
Fixes a small memory leak

Related to #18822
2023-03-11 15:13:16 +00:00
Martin Mathieson 4240941d8f Fix some warnings from check_typed_item_calls.py 2023-03-11 12:28:04 +00:00
John Thacker a329db7dd2 TLS: Fail without exception when decrypting truncated records
On truncated TLS records, just fail when attempting to decrypt or
calculate the handshake hash instead of raising an BoundsError.
The appropriate exception will be raised later when fields are
actually added to the tree.

This only makes a difference on the first pass, especially with
unencrypted initial handshake messages, as we don't try to decrypt
or calculate the hash on the second pass.

Fix #18896
2023-03-11 02:03:16 +00:00
Dr. Lars Völker 5f7122828c UDS: make code more readable by reformatting HFs 2023-03-10 21:53:13 +01:00
Harald Welte ae38e9b092 New dissector for GSM L2RCOP (3GPP TS 27.002)
This is a dissector for the GSM "Layer 2 Relay Character Oriented
Protocol" as used in non-transparent CSD (Circuit Switched Data)
calls in GSM and UMTS cellular networks.
2023-03-10 19:55:19 +00:00
Harald Welte f64e8f0796 Add new dissector for GSM RLP protocol (3GPP TS 24.022)
This protocol is used in the user plane of non-transparent CSD (Circuit
Switched Data) calls in GSM networks. RLP frames are sent over the Um
air interface, and are sent as modified V.110 frames over 64k TDM
channels in the back-haul/core network.  For modern implementations,
this means in RFC4040  RTP CLEARMODE.

As there's no V.110 decoder in wireshark, we cannot connect the RLP
decoder to that.  However, we hook it up to the GSMTAP dissector to
enable other software to pass the decoded RLP frames into wireshark.
2023-03-10 19:55:19 +00:00
Dr. Lars Völker 5c32f5bbd1 UDS: Cleanup and rework 2023-03-10 18:59:59 +00:00
Gerald Combs 0a558f9143 GitLab CI: Adjust our fuzz run time
[skip ci]
2023-03-10 10:07:10 -08:00
Mathis Marion c8e2cc7552 Add Silicon Labs copyright to packet-wisun.c 2023-03-10 17:26:22 +00:00
Mathis Marion 26c691c8cd Use Wi-SUN PHY mode ID dissector for MDR command 2023-03-10 17:26:22 +00:00
Mathis Marion ab06f6de7a Add Wi-SUN MDR command dissector 2023-03-10 17:26:22 +00:00
Mathis Marion 9f4947609e Always dissect IEEE 802.15.4 vendor command OUI
This changes the tree received by registered vendor dissectors (the
OUI isn't part of the dissected tree anymore). Thankfully there are
currently no dissector registered.
2023-03-10 17:26:22 +00:00
Zoran Bošnjak 3cbb560102 specs conversion minor update
Update for structure change introduced in revision #007b214 of asterix-specs.
2023-03-10 17:03:45 +00:00
hidd3ncod3s 1e5514061d Fix build warnings 2023-03-10 06:44:14 +00:00
hidd3ncod3s 2452c537e3 Generate SRVSVC parser using PIDL 2023-03-10 06:44:14 +00:00
hidd3ncod3s c1c9040952 Update SRVSVC IDL and CNF 2023-03-10 06:44:14 +00:00
Preben Guldberg b50ed1dc80 GUI: Colorize with filter could use an old filter
When right-clicking an item in the packet details and using "Colorize
with Filter", the colour may be applied using the wrong filter.

The code currently only updates the filter used for "Colorize with
Filter" if the packet details are visible and has focus. This is not
the case when you switch from one packet to another (at least by
clicking the other frame in the packet list).

The patch moves the emit of fieldFilterChanged() up to where the
filed_filter is identified. This seems the least intrusive.
2023-03-09 22:40:35 +00:00
Gerald Combs 3b7f810f36 Docs: Fix the Developer's Guide chapter order
The build intro should be the first chapter in part II.
2023-03-09 10:40:47 -08:00
Jiří Engelthaler 45274a7b9a IEC104: Unifying filter names 2023-03-09 17:53:11 +00:00
Martin Mathieson 32541d81c9 ORAN FH CUS: Expert malformed info if > 3 bytes in frame after PDU 2023-03-09 15:42:16 +00:00
Jaap Keuter cc04dad6d0 Qt: Put p->show() before p->setVisible to allow later to take effect
Closes #18882
2023-03-09 13:35:34 +00:00
Mathis Marion d574cd2c24 Add support for Wi-SUN JM-IE and JM-PFL 2023-03-09 10:33:48 +00:00
Mathis Marion 0355477618 Add support for Wi-SUN LBATS-IE 2023-03-09 10:33:48 +00:00
Mathis Marion bf53ea5080 Drop support for Wi-SUN NR-IE Listening Type
This feature was dropped between versions 1.1v00 and 1.1v01 of the
Wi-SUN FAN specification.
2023-03-09 10:33:48 +00:00
Dr. Lars Völker 321932d310 TECMP: Cleanup and fix units
- The Voltage was not showing the unit V.
- The temperatures now use directly the base unit degree Celsius.
2023-03-09 09:54:15 +00:00
Gerald Combs 9a63e4cf79 ORAN FH CUS: Add an array length check
Fixes #18895.
2023-03-09 09:40:31 +00:00
John Thacker 2a7e4982a5 dumpcap: Make debugging compile again
Commit e921b804d0 removed the
user data parameter from logging, so remove it here.

Explain how the debugging defines work.

If DEBUG_DUMPCAP is defined and dumpcap is a capture child, don't send
logs to stderr with normal formatting, because that will be connected to
the sync pipe.  Don't send them to stdout either, because that can be
connected to a data pipe (e.g., for retrieving interface information.)
Instead, send it to stderr with the special formatting so that the
parent recognizes it.

Use va_copy if both DEBUG_DUMPCAP and DEBUG_CHILD_DUMPCAP are defined,
avoiding undefined behavior that can lead to segfaults.

Set the log level to DEBUG when running as a capture child if the
DEBUG defines are set, because sync_pipe_start doesn't pass along
log level information. If you turned on the extra #define, you
presumably want to debug.

If logging to a file, open the file before any log messages.

Get rid of a check for the log level being below the default level.
It's either redundant of a check already done in ws_log_full, or it
prevents logs from being shown when dumpcap is run standalone with
logging options.
2023-03-08 21:22:51 -05:00
Jaap Keuter 92fb895241 netlink: Add netfilter conntrack status flag hw_offload 2023-03-08 20:08:04 +00:00
Jaap Keuter 4c7d2a771f netlink: Add netlinkrt handling of RTM_SETLINK
References #18697
2023-03-08 18:04:26 +01:00
Jaap Keuter 0e63c25f66 netlink: implement new identifiers from Linux 6.2 kernel 2023-03-08 13:58:48 +00:00
Guy Harris ff9e2494a1 json_dumper: rework the error checking to improve error messages.
Fix the file name in the introductory comment.

Update a comment to note that a base64 value is handled, in some ways,
like a nested element, even though it's not nested in the way that an
object or array is.

Have json_dumper_bad() write current stack depth and the current and
previous types in, if possible, symbolic or numeric form; don't dump
other information.  Also have it set JSON_DUMPER_FLAGS_ERROR, so no
other routine needs to do so.

Add routines to check for dumper stack overflow *and* underflow and
report them with appropriate messages, and use them in routines that
push onto or pop off of that stack, respectively.

This means that the stack depth won't overflow or underflow, so we can
make it unsigned (as it will never underflow below 0) and don't need to
check for negative or bigger-than-the-stack values.

Pull check out of json_dumper_check_state() into various existing or new
routines (for common code to call in those existing routines), and have
the error messages passed to json_dumper_bad() give a more detailed
explanation of the particular problem detected.
2023-03-08 05:06:25 -08:00
Igor Dmitriev 212cec9f7b TRDP: Fixed typo and indentation in packet-trdp.c 2023-03-08 09:58:43 +00:00
Igor Dmitriev 649b20cb44 TRDP: Updated release notes 2023-03-08 09:58:43 +00:00
Igor Dmitriev c11cffda3c TRDP: Add dissector for TRDP protocol 2023-03-08 09:58:43 +00:00
Dr. Lars Völker 17273f2258 UDS: Remove unneeded functions to clean up code
Removed the following functions as they are not needed anymore:
- masked_guint8_value
- tvb_get_guintX
2023-03-08 09:03:06 +00:00
Stig Bjørlykke 6fc17a1303 ieee80211: Add a field for WLAN Flags
Add the frame control flags string to a new field. This can be
used in a custom column, similar to TCP Flags.
2023-03-08 07:28:28 +00:00
Michal Ruprich 34d3f122d3 Converting QByteArray to const char * 2023-03-07 19:31:50 +00:00
Martin Mathieson e6eca89501 ORAN FH CUS: Misc usability changes 2023-03-07 17:03:08 +00:00