Commit Graph

87549 Commits

Author SHA1 Message Date
João Valverde d6380e7ae4 CMake: Replace deprecated module FindPythonInterp 2023-05-26 19:38:42 +00:00
João Valverde b4f2980722 CMake: Fix a try_run() test when cross-compiling 2023-05-26 19:34:11 +00:00
João Valverde c0a8ea9c9c CMake: Tweak MinGW options 2023-05-26 19:34:11 +00:00
Martin Mathieson 67e8c877e1 E2AP: name lookup was missing new RANFunction "NI" 2023-05-26 15:46:37 +01:00
zhilei zhang 679ce68b13 add sm3 oid
from GM/T 0006 Cryptographic application identifier criterion specification
2023-05-26 12:59:58 +00:00
João Valverde 2f948caf07 Fix missing config.h definitions
Fixes 8dc5d2d348.
2023-05-26 12:00:22 +01:00
Stephen Donnelly a3b3f84cfc Update Endace ERF Provenance
Updated ERF Provenance field list
Added Provenance Section names to Info column
2023-05-26 15:28:07 +12:00
John Thacker f409a1cf2c editcap: Use the interval start for new file names
When writing files spaced over equal time periods, instead of
using the timestamp in the packet record for a new filename,
use the interval start. This keeps the filenames equally spaced,
and is especially clearer when writing empty files because no
packets occurred in that interval.

Fix #19067
2023-05-26 01:31:20 +00:00
João Valverde 4fb99bb462 wsutil: Fix unused function warning with Fedora MinGW cross 2023-05-26 01:20:17 +01:00
João Valverde 9f7f472f49 androiddump: Fix warning [-Wdiscarded-qualifier]
wireshark/extcap/androiddump.c:573:48: warning: passing argument 5 of 'select' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  573 |             if ((select(0, NULL, &fdset, NULL, &timeout) != 0) && (FD_ISSET(sock, &fdset))) {
      |                                                ^~~~~~~~
2023-05-26 01:16:59 +01:00
João Valverde dde314f4b2 capture-wpcap: Rename a stub function
This stub implements an interface from WinPcap/Npcap. The function
declaration differs in a constness attribute between different WinPcap
flavors, leading to pain and tears. Just rename the function instead
so it doesn't clobber any public declaration from WinPcap/Npcap and
cause mismatched declaration errors.
2023-05-26 00:20:19 +01:00
João Valverde 8dc5d2d348 Fedora: Fix cross-compilation with mingw-wpcap
Fix various issues preventing compilation with Fedora's
MinGW WinPcap package.
2023-05-26 00:18:59 +01:00
Daniël van Eeden 16b99b0270 MySQL: Only check for 0xfb response code in specific states 2023-05-25 22:34:35 +00:00
Martin Mathieson 620c33b6ff E2AP: Add NI v1.00 2023-05-25 22:16:27 +00:00
João Valverde 51accf1b90 Allow using host Lemon executable
Add support for using the host system's lemon binary instead of
compiling our own. Many linux distributions include a lemon
parser generator package. Using this binary when cross-compiling
is much simpler than configuring the build to use the build host
toolchain to compile lemon.
2023-05-25 21:45:22 +00:00
João Valverde 0da67aee02 CMake: Reformat UseLemon.cmake
Replace spaces with tabs and use lower-case CMake names to
match our usual style.
2023-05-25 21:45:22 +00:00
Gerald Combs c05d11204d Windows: Update our libsmi packages
Update to the latest git commit and add Arm64.
2023-05-25 12:41:54 -07:00
João Valverde 5051378b69 CMake: Add "pwsh" as a PowerShell name
PowerShell on Linux is installed as "pwsh".
2023-05-25 19:08:30 +01:00
Radek Liska 2917eaaefc rpm: don't overwrite user changes to diameter/Custom.xml on package upgrades 2023-05-25 17:01:00 +00:00
Gerald Combs c4f242e6ac Revert "Revert "GitLab CI: Update the GitLab macOS runner info""
https://gitlab.com/gitlab-org/ci-cd/shared-runners/infrastructure/-/issues/79
should be fixed, so reenable the new macOS runners.

This reverts commit 6653a0e6ef.
2023-05-25 16:49:58 +00:00
João Valverde 783627a109 Docs: Move MSYS2 instructions to WSDG
Ping #17771.
2023-05-25 16:49:06 +00:00
John Thacker d6d34fc60d GitLab CI: Check the ASN.1 dissectors consistency
Regenerate the ASN.1 dissectors in the Code Checks job, and fail
if any tracked files have changes after doing so.

This should make it impossible to commit changed to ASN.1 dissectors
without corresponding changes to the templates and conformance files,
and vice versa. (Perhaps the generated files shouldn't even be in git.)
2023-05-25 16:36:03 +00:00
John Thacker edcfbb06d2 MySQL: Make random access dissection work
Various data that is currently tracked in conversation data needs to
be moved to the per PDU data. The conversation data is only for the
last encountered value.

The remaining field packet count needs to be tracked in per frame data.

The most recent field metadata needs to be tracked in per frame data.

The number of parameters and number of fields received during the
last prepared statement can be retrieved from the statement data
of the last prepared statement id, which is already in per PDU data.

The statement data for a given statement id (which is not reused on
the same connection) should only be created on the first pass instead
of being recreated (in file scope) each time a PREPARE PDU is dissected.
2023-05-25 13:04:36 +00:00
j.novak@netsystem.cz 783eeb9a4c extcap: Remove duplicated bool value labels 2023-05-25 13:03:16 +00:00
John Thacker 3fceadef5d epan: Fix a comment
export object registers protocols by their filter name, not short name.

[skip ci]
2023-05-25 11:43:25 +00:00
John Thacker b1466bb989 multipart: media type table should be case insensitive
The dissector table that multipart media type has to override the
normal media type handling should be case insensitive, just like
the regular media type table
2023-05-25 07:10:31 -04:00
John Thacker 19c9393e43 ceph: Prevent malformed UTF-8 from truncation
The c_append_text() uses vsnprintf in order to create a buffer that
is then handed to two proto_item_append_text() calls. It doesn't
handle truncation of UTF-8 correctly. Instead of two levels of
variadic functions, change it to a variadic macro that calls
proto_item_append_text twice with the variable parameters.

Also don't use a redundant _add_string_format_value when the
formatting is just "%s".

Fix #19065
2023-05-25 10:24:04 +00:00
Nikolas Koesling 1e0989b418 add dissector for SINEC AP1 protocol 2023-05-25 10:17:16 +00:00
Stig Bjørlykke 3f5c9b7f9f wslua: Only register subtree array once
The subtree array must only be registered once to avoid double
register (assert) on Reload Lua Plugins.

Fixup 6a85da6823
2023-05-25 09:50:11 +02:00
John Thacker aca3eaed76 afs: Fix partition name UTF-8
Partition names have a name starting with /vicepa to /vicepz, where
the last character is stored as a 32 bit unsigned integer from 0 to 25.
Keep that integer unsigned; declaring it as a signed integer and doing
a less than comparison with 25 ends up adding all sorts of unprintable
characters to the tree when an erroneous value would be converted to
a negative number.

Fix #19093
2023-05-25 03:13:15 +00:00
João Valverde 3d104c7ab9 Add missing docbook-xsl rpm-setup.sh package 2023-05-25 02:20:13 +00:00
John Thacker 00271e0ecb 9p: Fix a string length
The length of the string returned after UTF-8 conversion is
not necessarily that of the number of octets of the message
before UTF-8 conversion, if there are illegal characters.

Fix #19096
2023-05-24 21:08:02 -04:00
João Valverde 989e9f65e4 Fix a missing include without libpcap 2023-05-24 21:07:21 +00:00
zhilei zhang 5928506896 add SM2 and SM2-with-SM3 OID
from GM/T 0006 Cryptographic application identifier criterion specification
2023-05-24 19:24:04 +00:00
chrysn e5ee6c058e CoAP: Block size is named "SZ" instead of "SZX"
SZX is short for "size exponent"; the number shown in the short line is already
the expanded size.
2023-05-24 16:57:27 +00:00
Gerald Combs ce87eac032 XRA: Fix an infinite loop
C compilers don't care what size a value was on the wire. Use
naturally-sized ints, including in dissect_message_channel_mb where we
would otherwise overflow and loop infinitely.

Fixes #19100
2023-05-24 16:14:59 +00:00
Gerald Combs 2e502cbf70 GitLab CI+Docbook: More win64 → x64 updates 2023-05-24 16:10:11 +00:00
John Thacker 6e7d199582 QUIC: Don't include data from other streams in Follow tap
If the stream length flag is set, use that to bound the tvb that
is sent to the follow tap.

Also fix the QUIC follow multistream test expected results, since
we shouldn't be including the padding that isn't part of the stream.

Fix #19102
2023-05-24 09:03:42 -04:00
John Thacker 5f51c4bb33 Decode As: Enable disabling a default dissector
Make it possible to use Decode As to set the current dissector
for an entry in a dissector table to NULL even if there is a
default dissector registered for that entry. (none) means (none)

This is different than disabling the dissector entirely, because
a dissector might be registered as default for multiple entries/ports,
and a user might want only to disable it for one entry, not in general.
Or, a dissector might have multiple registered dissectors and a
heuristic dissector, and a user might want to disable one dissector
registered value while still having the heuristic dissector enabled.

This is different than setting the dissector for the entry to Data,
because it still allows heuristic dissectors to get a chance.

This is different than setting a "Try heuristic sub-dissectors first"
preference, because it only affects the single entry in the tables,
instead of trying heuristic sub-dissectors first for all entries in
the table (and it works for all tables, even those that lack such a
preference.)

Move the default dissector to the top of the combobox so it is
still easy to reset to the default.

Fix #12098
2023-05-24 06:39:00 -04:00
Martin Mathieson cef49cd887 CIGI: Consolidate indentical true_false_strings 2023-05-24 11:03:09 +01:00
João Valverde 4e70ea33af Fix build on case-sensitive filesystems
Rename some files to match case-sensitive paths on Fedora.
2023-05-24 02:49:28 +01:00
Gerald Combs c845aa15fe GitLab CI: Update our Windows package names
Update our file globs to match fb1b022922.
2023-05-23 20:56:02 +00:00
João Valverde bc5718b0f0 Add python cache to gitignore
[skip ci]
2023-05-23 20:40:36 +00:00
João Valverde ad39e3ff36 CMake+MSYS2: Disable AirPcap by default 2023-05-23 20:39:59 +00:00
Gerald Combs fb1b022922 Packaging: Change our Windows installer filename format
Switch to Wireshark-<version>-{x64,arm64}.{exe,msi}.
2023-05-23 20:05:39 +00:00
Dr. Lars Völker d923c2ac94 Adding support for time relative to capture start
This patch allows to show time relative to capture start in the packet
details.

Currently only the BLF format uses this.
2023-05-23 13:50:44 +00:00
Gerald Combs caeedef803 Qt: Stop using flags to represent languages
As discussed at

https://www.flagsarenotlanguages.com/blog/

and

https://ux.stackexchange.com/questions/2472/how-to-graphically-represent-a-language

Flags don't correspond to languages very well in many cases. Don't add
them to our language list.

Add the Ioninc "language" icon from https://github.com/ionic-team/ionicons
and use it for the general "Use system setting" language item.

Remove an unneeded include.
2023-05-23 13:46:44 +00:00
John Thacker fdd1863a01 PER: Fix leaks in bit string, octet string
tvb_new_octet_aligned() can throw an exception, and creating
a new composite TVB but not appending any data (and thus not
attaching it to a chain) leaks data because the composite TVB
is never freed. So try to create the aligned TVB fragment first
before creating the composite TVB.

Fix some leaks in fuzzed captures
2023-05-23 08:36:41 -04:00
John Thacker 285a4cb39e Reassembly: Attach a replaced tvb to a new one in reassembled tables
Fixup 32e1750343 a bit. We can't
necessarily free a tvb for an entry in the reassembled table that
is being replaced, because there might be an address that directly
shares the tvb memory (thanks to set_address_tvb()).

If we can, add it to the chain for the replacement reassembly's tvb,
so it will still be freed.

Fix #19094
2023-05-23 12:14:38 +00:00
Ismael Mendez Matamoros 512557a328 RTPS: Added extra flags at the SECURE_PREFIX_FLAGS.
Added flags and filters for the following:
- Additional Authenticated Data bit
- Message protected with PSK
- Transport-Specific Message
- Endianness flag dissection improved
2023-05-23 12:00:12 +00:00