Commit Graph

85524 Commits

Author SHA1 Message Date
Car Benjamin b7a7921699 Increased EBHSCR packet size 2022-10-21 08:10:47 +00:00
Guy Harris 1070328597 packet bytes: do a simpler test for "is this ASCII?"
Just test whether the octet has the 0x80 bit set.
2022-10-21 00:42:42 -07:00
Guy Harris de50666ec0 packet bytes: don't assume the unadorned "char" type is signed.
The C language does not guarantee that "char" is signed or unsigned; it
just states that it's "implementation-dependent".

At least some C compilers for some architectures make it unsigned, so
you need "signed char" to get a signed value.  In particular, it's
unsigned for most ARM compilers (compilers for Darwin-based OSes such as
macOS make it signed on all platforms, including ARM), which causes a
warning about "ba[i] < '\0'" always being false.

The purpose of that test is to check for octets that correspond neither
to ASCII printable characters nor ASCII control characters; just test
with !g_ascii_isprint(ba[i]) && !g_ascii_iscntrl(ba[i]).  (Those are
macros, so it's not as if that adds any subroutine call overhead.)

Add some comments to explain what's being done in
ShowPacketBytesDialog::symbolizeBuffer() while we're at it.  (Not one of
the better uses of C++ polymorphism, giving "replace the octet at this
location with this sequence of octets" and "replace all octets equal to
this value with this sequence of octets" the same name, even though what
they do differs significantly.  I would have called one replace_at and
the other replace_all or something such as that, but the Qt developers
didn't ask me....)
2022-10-21 06:09:55 +00:00
Gerald Combs 139e46898d CMake+GitLab CI: Add and use RPMBUILD_EXTRA_ARGS.
Add an RPMBUILD_EXTRA_ARGS variable to CMakeLists.txt and use it in
GitLab CI to define __cmake_builddir. This should let ccache work with
our RPM builds.
2022-10-20 21:53:37 -07:00
John Thacker d7c993d4af epan: Fix the end offsets for hex string items
hex_str_to_bytes_encoding() consumes pairs of hex digits (and
optional separator) to turn into bytes. It can return a pointer
to the character after the last digit consumed. Don't advance
the end pointer after a single unpaired digit that is not consumed
as part of the hex string returned.

tvb_get_string_bytes() can pass back the end offset. If conversion
fails, return the initial offset instead of zero to make repeated
calls easier in cases where the full length is not decoded due to
errors.

Relatedly, no dissector currently uses this return value, because
it's not useful currently.
2022-10-21 01:11:53 +00:00
Gerald Combs 31ee273517 GitLab CI: Try to get ccache working for RPM builds. 2022-10-20 17:51:16 -07:00
Gerald Combs 1321de7dc3 Packaging: Fix our tarball commit logic.
If CI_COMMIT_SHA is set, it probably means we're building in GitLab CI.
Prefer it over our stash commit ID.
2022-10-20 15:39:53 -07:00
Gerald Combs 6d79c8c1f6 GitLab CI: Don't set absolute_paths_in_stderr.
It's not supported by openSUSE's ccache.
2022-10-20 21:48:36 +00:00
Gerald Combs 1283e29e53 Metamako: Fix a format specifier. 2022-10-20 14:09:10 -07:00
Gerald Combs a30774d8c1 GitLab CI: Set ccache's base_dir for RPM builds.
GitLab CI builds RPMs in a different directory for each pipeline
($CI_PROJECT_DIR/build/packaging/rpm/BUILD/wireshark-<version>), so set
base_dir to the build directory and enable absolute_paths_in_stderr.

Fix our cache directory max sizes as well.
2022-10-20 13:49:40 -07:00
Lewis Hamilton f5f561d5c7 Metamako: Metamako dissector update
The Metamako trailer has changed a lot over the years, this commit reflects these changes.
2022-10-20 20:09:20 +00:00
João Valverde 603354203b epan/proto: Replace format text()
The proto.h APIs expect valid UTF-8 so replace uses of format_text()
with a label copy function that just does formatting and does not
check for encoding errors. Avoid multiple levels of temporary
string allocations.

Make sure the copy does not truncate a multibyte character and
produce invalid strings. Add debug checks for UTF-8 encoding errors
instead.

We escape C0 and C1 control codes (because control codes)
and ASCII whitespace (and bell).

Overall the goal is to be more efficient and optimized and help
detect misuse of APIs by passing invalid UTF-8.

Add a unit test for ws_label_strcat.
2022-10-20 20:05:15 +01:00
Chuck Craft 000c2c0bf4 expert UAT: display field name on load error
https://ask.wireshark.org/question/29044
Tshark: Error loading table 'Expert Info Severity Level Configuration
2022-10-20 19:02:34 +00:00
Uli Heilmeier b42628389e CFDP: Fix empty source filename
Fixes: #18495
2022-10-20 18:43:41 +00:00
João Valverde 7b5ef933b0 C15H: Fix string truncation. 2022-10-20 18:41:46 +00:00
João Valverde 1bd29411a1 UCP: Validate string encoding 2022-10-20 18:41:46 +00:00
Richard Sharpe 00d1f4da87 ieee80211: Use greek leters in Beamforming matrices.
!18504
2022-10-20 18:33:05 +00:00
Gerald Combs 912f7122f9 GitLab CI: Check our commit before building MR jobs.
Make sure the Commit Check job passes before spending additional
resources.
2022-10-20 18:29:43 +00:00
Alexander Funke 1ab15061b5 IP: Fix fragment offset value calculation
The bitmask was applied twice, through the header_field_info
 and before calling proto_tree_add_uint.
Now using _format_value for correct calculation.
2022-10-20 17:52:12 +00:00
João Valverde 375cd6392e DHCPv6: Sanitize domain display labels for invalid UTF-8
Assume labels are encoded using ASCII. Validate them instead
of copying raw byte strings from the TVBuff.

Fixes #18398.
2022-10-20 17:51:08 +00:00
João Valverde 4eb78424d2 CMake: Add -Werror to test binaries 2022-10-20 18:26:49 +01:00
João Valverde c22dc30cac tvbtest: Fix printf() format 2022-10-20 18:13:14 +01:00
João Valverde 9fb07c1b79 Squelch some narrowing warnings.
The macro stores the length in an int. Add a cast to work squelch
the warning.
2022-10-20 17:11:56 +00:00
Gerald Combs 9270731976 GitLab CI: Enable ccache for our RPM package jobs. 2022-10-20 15:43:57 +00:00
John Thacker 2d831519c3 rtcp: Use setup_frame_number to look for conversations
Use the setup_frame_number to look for and create conversations
with srtcp_add_address, the same way as done in srtp_add_address.
This ensures that RTP and RTCP find the same conversation when
called back to back (as when handling them multiplexed on the
same conversation.

Related to #18460.
2022-10-20 14:03:38 +00:00
Stig Bjørlykke cac6a8452b h248: Add missing dot in H.248 protocol name
Add the missing dot in H.248 protocol name and dissector table.

Closes #18513
2022-10-20 13:20:01 +00:00
João Valverde 8f0985b19a SMB: Fix string truncation
As far as I can tell, get_unicode_or_ascii_string() always
nul-terminates string (as it should), so remove g_strlcpy()
copy that can truncate string and produce invalid UTF-8.
2022-10-20 12:03:52 +00:00
João Valverde 815415cda7 DNS: Add documentation for get_dns_name() 2022-10-20 12:03:52 +00:00
João Valverde 64bd646b2f DNS: Don't pass raw bytes to expert.h APIs 2022-10-20 12:03:52 +00:00
João Valverde bd0102fc64 LDAP: Validate DNS name string encoding 2022-10-20 12:03:52 +00:00
João Valverde d20ed9491c GSUP: Validate DNS name string encoding 2022-10-20 12:03:52 +00:00
João Valverde 93efea8ea9 Try to fix test suite failures on Win64
[skip ci]
2022-10-20 12:56:21 +01:00
Brian Sipos a81e90f39b TCPCL: Clamp and indicate lengths too large for Wireshark to handle
This fixes windows build errors reported in comments on !8541
2022-10-20 08:32:31 +00:00
Gerald Combs b2b76c2bae Qt: Add geolocation columns back to the Endpoints dialog.
Add geolocation columns back to the Endpoints dialog. Fix our
geolocation column alignments as well.

Fixes #18320.
2022-10-19 17:03:49 +00:00
Brian Sipos 5bb756e203 epan: centralize SDNV processing along other similar varint types
This avoids having general-purpose decoding happening in
non-DLL-exported functions defined in a dissector for #18478,
and removes unused functions and avoids duplicate decoding.
This also removes unnecessary early exit conditions for #18145.
Unit test cases for varint decoding are added to verify this.
2022-10-19 15:27:42 +00:00
Dylan Ulis d2e5bd80cb CIP: Minor cleanup/refactoring 2022-10-19 15:23:32 +00:00
John Thacker 7a4d05d63a charsets: Don't add illegal Unicode codepoints for UTF-16, UTF-32
If a character is not a valid Unicode codepoint, i.e. one of
the code points reserved for surrogate pairs or a code point
above 0x10FFFF, don't add it to a wmem_strbuf when converting
from other encodings but add a replacement character instead, by
using a new wmem_strbuf_append_unichar_validated() function.

Now we produce valid UTF-8 in various situations where UCS-2 or UTF-32
can encode unpaired surrogate codepoints. Consolidate some related
checks that are now redundant.

Also add a replacement character to the end of invalid UCS-2 strings
with an odd number of bytes, as done with UTF-16 and UTF-32.

Fix #18508
2022-10-19 07:53:02 -04:00
AndersBroman 5af53da434 json: Add media type application/3gppHal+json 2022-10-19 06:31:02 +00:00
Chuck Craft 69f1cd3eed build: rpm-setup.sh - typo in usage 2022-10-19 01:18:51 +00:00
Gerald Combs 0d59da3156 Qt: Fix the ByteViewText line height.
QFontMetrics::leading() was zero for Consolas on Windows in Qt5, but is
nonzero in Qt6. This revealed that we were inconsistently using height()
and leading() to calculate our line height. Just use lineSpacing()
instead.

Fixes #18438.
2022-10-19 01:06:37 +00:00
Chuck Craft 5b59771e8b wsdg: add arch-setup.sh; update options for others
Ping #17771
2022-10-19 00:25:01 +00:00
Richard Sharpe 45add8812d ieee80211: Improve the handling of Beamforming matrices.
Reduce the number of chars used so we can fit in the 240-byte limit.

Fixes #18504
2022-10-18 23:20:26 +00:00
Uli Heilmeier f90486246f README.plugins: Fix version variables
Fixes: #18507
2022-10-18 19:22:31 +00:00
João Valverde 4136b250c5 epan: Rename tvb_get_nstringz0()
Rename tvb_get_nstringz0() to tvb_get_raw_bytes_as_stringz()
to reflect the fact that this function does not return
a string (UTF-8 internal text string).

Remove tvb_get_stringz() because it is unused and just seems
dangerous.
2022-10-18 19:51:38 +01:00
João Valverde e4d5a44014 MEGACO: Fix proto_tree_add_string() call
Strings passed to proto_tree_add_string() must be UTF-8 encoded.

Fixes #18486.
2022-10-18 19:50:38 +01:00
Chuck Craft 41f14af980 build: bsd-setup.sh - make code like the others; FreeBSD gcrypt 2022-10-18 16:06:05 +00:00
John Thacker 6156e28a26 dhcp: Convert raw string to UTF-8 before adding to expert info
In PacketCable MTA capabilities, the length of the capability
is store as hex digits in ASCII. If bogus, the incorrect value
is added as an expert info. Ensure that it's formatted as UTF-8
and for display when added to the tree.

Fix #18437
2022-10-18 07:03:38 -04:00
Chuck Craft bc9a5ff70e build: fix typos in alpine-setup.sh 2022-10-17 16:55:28 -05:00
Vadim Yanitskiy b93e8234f6 GSM A-bis/RSL: dissect and show RFN using parse_reduced_frame_number()
3GPP came up with a special encoding of TDMA frame number, which reduces
the amount of bits needed to carry it from 32 to 16.  This encoding is
not only employed on the radio interface (GSM RR), but also on the
A-bis/RSL interface which is used between BTS and BSC nodes.

From the user perspective, parsed RFN value is a lot more meaningful
than the T1/T2/T3 variables used on the wire.  The GSM RR dissector
does show parsed RFN value together with these variables, while the RSL
dissector does not.  Let's show it in the RSL dissector too.
2022-10-17 19:45:15 +00:00
Vadim Yanitskiy 269d3a9968 GSM A RR: expose parse_reduced_frame_number()
This function will be used by the RSL dissector to show parsed RFN
value in the upcoming patch.
2022-10-17 19:45:15 +00:00