Commit Graph

81431 Commits

Author SHA1 Message Date
Chuck Craft a7d927a9e9 prefs_register_protocol_obsolete protocols with only obsolete prefs
Related to #17465 and !3526
2021-07-13 23:12:04 +00:00
bookding 175d75aa03 MySQL: Add support for session track gitds & transaction info 2021-07-13 21:43:41 +00:00
Martin Mathieson eb2015a373 DCT2000: Support a format for MAC-NR PDUs inside comment lines 2021-07-13 17:22:01 +01:00
Richard Sharpe 893ec461f2 ieee80211: Correctly handle trigger frames when there is no padding. 2021-07-13 07:10:15 -07:00
Dr. Lars Völker e8ceb9964c DoIP: Adding name resolution for Diagnostic Addresses (UAT)
This patch will add name resolution to the Diagnostic Addresses of
DoIP by using an UAT based table.
2021-07-13 09:25:16 +00:00
Dr. Lars Völker b82ef729aa TECMP: Adding name resolution for Channel IDs 2021-07-13 09:08:38 +00:00
Taisuke Sasaki 20785aed78 ISIS: Add Flexible Algorithm (draft-ietf-lsr-flex-algo-16)
- Add Flexible Algorithm Definition Sub-TLV
- Add IS-IS Application-Specific Link Attributes (rfc8919)
- Add Extended Administrative Groups Sub-TLV (rfc7308)
2021-07-13 08:49:06 +00:00
Anders Broman 1d590a8c4d ppcap: Remove unused preference code
These preferences has been obsoleted for a long time so let's get rid of
the code.
2021-07-13 07:43:07 +00:00
Uli Heilmeier 3413daad58 Multipart: Add option to uncompress data
Add an option to uncompress gzip:ed data.

Fixes: wireshark/wireshark#17471
2021-07-13 07:27:15 +00:00
Alexander Aring f9037e6537 packet-dlm3: update dissector for version 3.2
This patch updates the dlm3 dissector for version 3.2 which are
currently prepared for sending Linux upstream. The dlm dissector follows
the Linux implementation. There is no other protocol specification.

For the specific protocol changes see:

https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git/commit/?h=next&id=489d8e559c6596eb08e16447d9830bc39afbe54e
2021-07-13 07:10:48 +00:00
Alexander Aring 456c74cb1f packet-dlm3: dissect pdus for tcp case
Currently there can be multiple dlm messages in one tcp segment and in
some cases dlm message can be overlapped between two segments. The main
fix would be that we can now dissect multiple dlm messages if they
appear in one tcp segment. It's still own as one message in the "packet
flow" but in tree view it will be displayed as multiple messages which
are not visible.

For sctp the problem still exists, although there can't be overlapped messages.
2021-07-13 07:10:48 +00:00
Developer Alexander 69fb2a17e4 lua: dialog with prefilled values
new_dialog() lua api gets extended to enable that dialog fields can be
prefilled by lua scripts instead of always starting empty.
2021-07-13 06:52:55 +00:00
Arkady Gilinsky 054868cb0e oampdu: Fix DPoE get request parsing 2021-07-13 06:51:15 +00:00
Guy Harris fa9ee0f37a pcapng: process OPT_COMMENT in pcapng_process_options().
That option applies to all pcapng blocks, so handle it in common code.
2021-07-12 18:06:38 -07:00
Gerald Combs 4e5c892402 [Automatic update for 2021-07-11]
Update manuf, services enterprise numbers, translations, and other items.
2021-07-12 22:06:44 +00:00
Gerald Combs 077b787413 etwdump: Fixup our rec struct syntax.
Fix

```
C:\gitlab-builds\builds\-fyeYoMP\0\wireshark\wireshark\extcap\etl.c(590,10): error C2232: '->block': left operand has 'struct' type, use '.' [C:\gitlab-builds\builds\-fyeYoMP\0\wireshark\wireshark\build\extcap\etwdump.vcxproj]
C:\gitlab-builds\builds\-fyeYoMP\0\wireshark\wireshark\extcap\etl.c(590,10): error C2232:     rec->block = wtap_block_create(WTAP_BLOCK_PACKET); [C:\gitlab-builds\builds\-fyeYoMP\0\wireshark\wireshark\build\extcap\etwdump.vcxproj]
C:\gitlab-builds\builds\-fyeYoMP\0\wireshark\wireshark\extcap\etl.c(590,10): error C2232:          ^ [C:\gitlab-builds\builds\-fyeYoMP\0\wireshark\wireshark\build\extcap\etwdump.vcxproj]
C:\gitlab-builds\builds\-fyeYoMP\0\wireshark\wireshark\extcap\etl.c(591,39): error C2232: '->block': left operand has 'struct' type, use '.' [C:\gitlab-builds\builds\-fyeYoMP\0\wireshark\wireshark\build\extcap\etwdump.vcxproj]
C:\gitlab-builds\builds\-fyeYoMP\0\wireshark\wireshark\extcap\etl.c(591,39): error C2232:                                       ^ [C:\gitlab-builds\builds\-fyeYoMP\0\wireshark\wireshark\build\extcap\etwdump.vcxproj]
```
2021-07-12 14:40:21 -07:00
David Perry 06ed6930dc Carry EPB flags as an option on the packet block
As requested by [this comment][1] on !2859, move `pack_flags` from a
dedicated field in `wtap_rec` to a block option on the packet block in
`wtap_rec.block`.

[1]: https://gitlab.com/wireshark/wireshark/-/merge_requests/2859#note_615984624
2021-07-12 12:41:57 -04:00
Martin Mathieson 86e2fda11e check_typed_item_calls: fix typo 2021-07-11 17:15:44 +01:00
Martin Mathieson 030d659f88 More mask checks and some fixes. 2021-07-11 14:55:55 +00:00
João Valverde 89acb935bc wsutil: Start adding a test suite 2021-07-11 14:39:13 +00:00
João Valverde 396d560744 wsutil: Revert some changes to format_size()
Revert change to format_size() added in
f509a83381. This commit broke formatting
with spaces and introduced some dead code.

Also replace unnecessary call to format_size_wmem() and remove
unnecessary casts (since our warning settings were fixed in the
mean time).
2021-07-11 14:39:13 +00:00
Guy Harris c4731738fc sharkd: various cleanups.
Extend sharkd_dissect_request() so that it can replace
sharkd_dissect_columns().

Have it return a status indicating success, invalid frame number, or
read error, so that the caller knows what the problem is.

Pass it pointers to the wtap_rec and Buffer to use when reading packets
from the file, so that if it's called in a loop iterating over all
frames, those structures can be initialized once, before the loop, and
cleaned up once, after the loop, rather than doing both once per loop
iteration.

Pass pointers to the read error code and additional read error
information string pointer, so that, on a file read error, that
information is available to the caller.

Get rid of sharkd_dissect_columns(); instead, use
sharkd_dissect_request(), with code from the loop body pulled into a
callback routine.  Fix that code to correctly determine whether the
current frame has any comments, rather than just treating all frames
that have blocks as having comments.

Use _U_ to mark arguments as unused, rather than throwing in a

	(void) variablename;

statement.

Move some variables used only within a loop into the for() statement or
the loop body.
2021-07-11 03:06:10 -07:00
Gerald Combs 379352ef7f CMake: Remove a duplicate target include directory.
epan/CMakeLists.txt set both SYSTEM PUBLIC and SYSTEM PRIVATE for
GLIB2_INCLUDE_DIRS. The PUBLIC keyword adds it to the
INTERFACE_INCLUDE_DIRECTORIES property, which is only appropriate for
includes that we ship with Wireshark, so remove that one. Make
GLIB2_LIBRARIES private as well.

Fixes #17477.
2021-07-11 06:47:07 +00:00
João Valverde afdfa9c469 wmem: Add assertion macro with WS_DISABLE_ASSERT
wmem has many assertions during dissection, these are assumed to have
a measurable performance impact so remove assertions with
WS_DISABLE_ASSERT, like is done elsewhere.

We don't use ws_assert() to avoid a dependency on wsutil.

g_assert_not_reached() does not have a performance impact and for
that reason should not be disabled.
2021-07-10 14:29:12 +00:00
João Valverde 2dee8a3a29 wmem: Remove dependency on wsutil
This allows wsutil to depend on wmem without introducing a circular
dependency.

Although wmem is included in epan it is in many ways an independent
library and it should remain so.
2021-07-10 14:29:12 +00:00
João Valverde 6498f1fce5 wslog: Fix representation of null domain
Map "" to "(none)", besides NULL.
2021-07-09 23:43:49 +01:00
João Valverde d48c7e9305 make-version.pl: Remove duplicate "-f" option 2021-07-09 22:25:20 +01:00
João Valverde ffcfc83ecb Rename version.h to be more descriptive
Version.h is too generic. This is specific to VCSVERSION and that
should be made more obvious and discoverable.
2021-07-09 18:27:41 +00:00
João Valverde e81a400edb wmem: Use quotes for an internal include
This is consistent with the rest of the implementation.
2021-07-09 17:55:20 +00:00
João Valverde de59975fc1 wslog: fixup copyright 2021-07-09 18:25:02 +01:00
João Valverde cb61645941 wslog: Fix comment 2021-07-09 18:24:39 +01:00
Martin Mathieson ba0d6f69ab RSL: Fix mask of eMLPP Priority field.
9.3.49 in 48.058wq
2021-07-08 18:08:53 +00:00
Martin Mathieson 9e5d051a8a check_typed_item_calls.py Some more mask checks
Fix a handful of (trivial) issues found.
2021-07-08 13:02:18 +00:00
Guy Harris 95bee83fbc editcap: clean up some comments for consistency. 2021-07-08 09:12:28 +00:00
Andreas Schultz 9e29ec0940 RADIUS: replace ULI decoder with version from GTPv2
Reuse the DIAMETER dissector for 3GPP-ULI for RADIUS as well.

The DIAMETER dissector for 3GPP-ULI IE is more complete than the RADIUS
version. The format of the IE is the same in RADIUS and DIAMETER.
2021-07-08 08:56:45 +00:00
Guy Harris 831f6233ad Change "edited" to "modified" in one more place when referring to blocks.
Modifications aren't necessarily the result of a user editing something.
2021-07-08 08:30:41 +00:00
Joakim Andersson 53f31f100f nordic_ble: Fix packet times for multiple interfaces
Fix packet times calculations when using multiple interfaces.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-07-08 07:52:17 +00:00
Guy Harris dd5907d2a3 Consistently refer to blocks that have been modified as "modified".
"User" sounds as if the blocks belong to the user; at most, the current
user might have modified them directly, but they might also have, for
example, run a Lua script that, unknown to them, modified comments.
Also, a file might have "user comments" added by a previous user, who
them wrote the file and and provided it to the current user.

"Modified" seems a bit clearer than "changed".
2021-07-08 00:05:35 -07:00
Gerald Combs 6dfa2cb0ae Win32: Fix a string length check.
Check the length of a string directly. Fixes Coverity CID 1487026.
2021-07-08 04:12:45 +00:00
David Perry 73087d6fb4 Use wtap_blocks for packet comments
Mostly functioning proof of concept for #14329. This work is intended to
allow Wireshark to support multiple packet comments per packet.

Uses and expands upon the `wtap_block` API in `wiretap/wtap_opttypes.h`.
It attaches a `wtap_block` structure to `wtap_rec` in place of its
current `opt_comment` and `packet_verdict` members to hold OPT_COMMENT
and OPT_PKT_VERDICT option values.
2021-07-07 18:40:24 +00:00
Pascal Quantin 20f38c06ea LPP: upgrade dissector to v16.5.0 2021-07-07 18:09:24 +00:00
Pascal Quantin 204642089a NR RRC: upgrade dissector to v16.5.0 2021-07-07 17:37:07 +00:00
Andreas Schultz 4992806dba GTPv2: fix decoding of (extended) eNodeB id
3GPP TS 29.274, clause 8.21.7 and 8.21.8 clearly specify a total
length of 6 bytes for these fields.
2021-07-07 17:20:01 +00:00
Pascal Quantin ce9b01f059 LTE RRC: upgrade dissector to v16.5.0 2021-07-07 17:34:28 +02:00
Pascal Quantin 1c3739c360 NGAP: fix dissection of gNB/ng-eNB transparent container 2021-07-07 14:27:58 +00:00
Nardi Ivan c2d77d910d QUIC: improve "Follow QUIC Stream" support
This functionality has been added in d2a660d8, where its limitations
are described.
Improvements:
* the Substream index menu now properly filters for available stream numbers;
* Follow Stream selects the first stream in the current packet

Known issue (which is still there):  if a packet contains multiple QUIC
streams, then we will show data also from streams other than the selected
one (see #16093)

Note that there is no way to follow a QUIC connection.

Close #17453
2021-07-07 13:08:19 +00:00
Nardi Ivan a6932f56dc wmem: add a GCompareFunc implementation to compare unsigned integer 64 bits long 2021-07-07 13:08:19 +00:00
David Perry 8dc1660ef8 Fix compiler warning in packet-json.c
Clang gives a fatal warning about "explicitly assigning value of
variable of type 'int' to itself". The statement (and the `if` around
it) are redundant, so this removes both.
2021-07-07 06:48:41 -04:00
Martin Mathieson f9db3ef394 ORAN FH CUS: Fix some field widths
Some fields were articially grouped together
into longer types, with masks that had leading
or trailing zero bytes.
2021-07-07 09:29:52 +00:00
Martin Mathieson 3dd7ba03fa tools/check_typed_item_calls.py: Add extra mask checks 2021-07-07 10:00:45 +01:00