Commit Graph

81609 Commits

Author SHA1 Message Date
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
Developer Alexander 8a630ad6d0 json: improved path based filtering
It is the intention to enable more precise filtering for json. 6 changes were
made for this:

- 'json.member' becomes filterable as a string field with the key of the
member. Before the key was only appended as text but was not filterable.

- Every item gets a field 'path' which allows to filter for elments
which are at a specific position within the json. To make anonymous arrays
visible (no member key) they appear as '[]' in the path. (For example arrays
 in arrays)

- Every string, number, true, false, true or null item gets a field
'path_with_value' which combines the path of this element with its value. This
allows a filtering for values of elements at a specific position within the
json.

- Every string, number, true, false, true or null item gets a field
'member_with_value' which combines the key of this element with its value. This
allows a filtering for specific key-values-pairs independently of the position
within the json.

-It is possible to hide 'path', 'path_with_value', 'member_with_value' by
a preference called 'Hide extended path based filtering'.

- If the provided buffer does not start with the json object but has some
leading bytes which does not belong to the json object there is a new option to
ignore these bytes. This behaviour can be enabled by the newly introduced
preference 'Ignore leading non JSON bytes'.
2021-07-06 19:16:29 +00:00
Martin Mathieson 43077b96e8 Fix a few dissector spelling errors. 2021-07-06 07:52:21 +00:00
Gerald Combs d3f8754874 Win32: Fix a couple of Coverity warnings.
Fix

838             elapsed_time = (unsigned int)(stats.stop_time-stats.start_time);
839             if(status == PREVIEW_TIMED_OUT) {
>>>     CID 1486835:  Control flow issues  (DEADCODE)
>>>     Execution cannot reach this statement: "StringCchPrintfW(string_buf...".

and

909             /* Default window background */
910             SendMessage(hwnd, EM_SETBKGNDCOLOR, (WPARAM) 1, COLOR_WINDOW);
>>>     CID 1486836:  Resource leaks  (RESOURCE_LEAK)
>>>     Variable "strval" going out of scope leaks the storage it points to.
2021-07-06 07:32:31 +00:00
Martin Mathieson 06e7426efb ORAN FS CUS: Factor out a couple of common functions
Types that are common to section extension types
1 and 11.
2021-07-06 05:49:22 +00:00
Shubham jha 41deb9dd9b Improved PIM dissector with capability to parse multiple TLVs and additional attribute types 2021-07-06 05:48:47 +00:00
Anders Broman 2270056073 Revert "Wirehark Windows: Harden build with Shadow Stack and EHCONT metadata"
This reverts commit ebb8703a50.
2021-07-05 15:48:48 +02:00
Anders Broman 14f6769280 Diameter:Update some AVPs and enums. 2021-07-05 12:17:27 +00:00
Martin Mathieson c5f52508e1 Voip calls: avoid leaking seq analysis item
CID 1477861
2021-07-05 09:38:44 +01:00
Andre Luyer 9f8e6b1acb tshark/wireshark: Fix check ring buffer option for packets
tshark and wireshark did not allow only -b packets:value option, while dumpcap does.
This change adds the same check in tshark and wireshark as in dumpcap.

Quick fix for issue mentioned at https://ask.wireshark.org/question/23437/why-does-tshark-b-packetsvalue-not-work/
2021-07-04 19:55:59 +00:00
Gerald Combs d170dff7eb [Automatic update for 2021-07-04]
Update manuf, services enterprise numbers, translations, and other items.
2021-07-04 15:55:26 +00:00
João Valverde 100876337a Move version_info.[ch] to ui/
Version info is an aspect of UI implementation so move it to
a more appropriate place, such as ui/. This also helps declutter
the top-level.

A static library is appropriate to encapsulate the dependencies
as private and it is better supported by CMake than object libraries.

Also version_info.h should not be installed as a public header.
2021-07-04 10:37:49 +00:00
João Valverde 47d2afd990 sharkd: Prefer version_info.h instead of version.h 2021-07-04 10:37:49 +00:00
João Valverde 3a3fda2ca4 epan: Remove dependency on version_info object library
Dependending on version_info is unnecessary and forces an epan
rebuild every time the git commit id changes, which can be slow,
especially with LTO enabled, and again is unnecessary.

Printing the VCS version to the TLS debug log is a minor convenience
that doesn't justify the cost to relink epan with every commit.
2021-07-04 10:37:49 +00:00
Pascal Quantin aa5df68171 NR RRC: fix dissection of MeasTriggerQuantityOffset element 2021-07-04 12:03:45 +02:00
Dr. Lars Völker f54efc5608 TECMP: Making IDs for CAN, FlexRay, LIN HEX_DEC
This patch changes the display from HEX to HEX_DEC of important IDs.
2021-07-03 14:46:10 +00:00
Prince Paul 30058542e9 ASTERIX: Fix Data Item 010/091
Fixed Item Number from 110 to 091
2021-07-03 14:29:38 +00:00
Martin Mathieson 9512524ef8 ORAN FH CUS: Fix/update existing supported section extensions 2021-07-02 18:17:08 +01:00
Prince Paul 79f62acbe7 ASTERIX: Fix Value of hf_010_202_VY from VX to VY
Fix typo VX to VY
2021-07-02 11:13:24 +00:00
Pascal Quantin 8f69254638 E1AP: upgrade dissector to v16.6.0 2021-07-02 10:57:29 +00:00
Isaac Boukris 5f8a932338 kerberos: fix compilation without kerberos
regressed_by: 38810b76

Reported-By: @crondaemon <Dario Lombardo>.
2021-07-02 10:32:18 +00:00
Pascal Quantin 498f5bf7d1 F1AP: upgrade dissector to v16.6.0 2021-07-02 10:10:23 +00:00
Pascal Quantin 95bc8cf328 XnAP: upgrade dissector to v16.6.0 2021-07-02 09:35:09 +00:00