GitLab

Without this, the simple stat tables default to sorting by the first
column in descending order. (An artifact of the QTreeWidget that they
inherit from.) The first column is generally a message type (integer or
string) and ascending order makes more sense.

Some of the stat tables intentionally insert rows in a preferred order
that is different than sorting by the first column (e.g, ANSI A I/F tables
are sorted by the second column), but we can't tell what that is.
QTreeWidget only allows the data to be shown in its original unsorted
order if the widget is marked unsortable, but then the user isn't allowed
to sort at all, and being able to sort by other columns (such as count)
is useful.


(cherry picked from commit 7987df81)

Jason Cohen authored May 17, 2022 and Alexis La Goutte committed May 18, 2022

Some versions of BIG-IP create Type 2 Version 0 records with the
Type 2 Version 1 size.  Allow for the decoding of these records.


(cherry picked from commit 0cab39a8)

Roland Knall authored May 16, 2022 and Roland Knall committed May 17, 2022

The current situation in UatDelegate as well as PathChooserDelegate leads to issues, where Wireshark crashes if the button is clicked. This is due to the UI not correctly positioning the button inside the cell.

This change implements a widget, which will serve as cell content, handling all relations with choosing the file, but also properly handling the size and geometry of said cell content, therefore no longer leading to crashes and cleaning up code at the same time, as duplicate methods are being removed.

Fixes #17789, #17819, #18088

Roland Knall authored May 16, 2022 and Gerald Combs committed May 16, 2022

Windows implements so called CRT handlers, which will catch any
assertions happening inside so called crt routines and either
displays a debug dialog (Cancel, Retry, Ignore) or outright crashes
the application.

See
https://docs.microsoft.com/en-us/cpp/c-runtime-library/parameter-validation?view=msvc-170
for an explanation of the behaviour.

Now, in the current situation here, close will detect (correctly)
that the pipe it is supposed to be closing is already closed. This
happens (again correctly) because it had been closed by the extcap
application.

The change added, checks for a closed pipe first, and if so just
returns -1 (as it should) silently without calling the CRT routine,
therefore not crashing


(cherry picked from commit 28b917a7)

Gerald Combs authored May 16, 2022 and Gerald Combs committed May 16, 2022

It's Windows-only.

(cherry picked from commit 6c612bf2)

Gerald Combs authored Apr 26, 2022 and Gerald Combs committed May 16, 2022

In validate-clang-check.sh, only check files that have rules in
compile_commands.json or build.ninja.

(cherry picked from commit b53d3495)

Jaap Keuter authored Jan 04, 2022 and Gerald Combs committed May 16, 2022

(cherry picked from commit a4cbf047)

Anders Broman authored Dec 22, 2021 and Gerald Combs committed May 16, 2022

(cherry picked from commit b5928542)

Zoran Bošnjak authored Oct 29, 2021 and Gerald Combs committed May 16, 2022

Asterix data format is a complex family of asterix categories,
where each individual category exists in multiple editions.
As a result of many variants, the epan/dissectors/packet-asterix.c
is one of the largest dissectors.

So far, the asterix dissector had been maintained manually, where the
generic decoding routines and category/edition specific definitions
were entangled in the same file (packet-asterix.c).

This commit preserves the overall dissector structure, but makes
it easy to update the dissector with new categories or editions as
they become available (via the update script from this commit).
See tools/asterix/README.md file for dissector update procedure.

This commit includes:

- tools/asterix/packet-asterix-template.c
  Extraction of generic asterix decoding routines and
  common data structures.

- tools/asterix/update-specs.py
  Update script, to render the template with up-to-date asterix
  specs files. The asterix specs files themselves are maintained in
  a separate repository.

- epan/dissectors/packet-asterix.c
  Automatically generated dissector for asterix data format.
  Although generated, this file needs to remain in the repository,
  to be able to build the project in a reproducible way.

The generated asterix dissector was additionally tested with:

- ./tools/check_typed_item_calls.py --mask
- ./tools/fuzz-test.sh

Sync with asterix-specs #cef694825c

(cherry picked from commit 16779dc4)

Update manuf, services enterprise numbers, translations, and other items.

Gerald Combs authored May 11, 2022 and Gerald Combs committed May 11, 2022

Qt::endl was introduced in 5.14.
(cherry picked from commit 7b749f5e)

Fixes #18084.

Display filters on Windows where broken in such a way that the file was generated with empty lines and the wrong file delimiters.

Likewise, loading the file lead to issues when the formatting was not 100% match by the plattform being used

Fixes #18082


(cherry picked from commit ad28888d)

Update manuf, services enterprise numbers, translations, and other items.

Odysseus Yang authored May 06, 2022 and Pascal Quantin committed May 06, 2022

(cherry picked from commit 8f4d38b7)

The handshake hash is used to derive TLS decryption keys when the
Extended Master Secret (EMS) extension is in use.
ssl_calculate_handshake_hash updates this hash only when the master
secret has not been determined yet.

During TLS renegotiation, there are two master secrets: one before, and
one after. Before this fix, the second calculated master secret is
wrong because the second Client Hello is missing in the handshake hash.
It was missing because the handshake hash was not being updated since
the master secret for the first handshake was still present, and the
decryption state was only reset after that hash update.

To fix this, make sure to clear the SSL_MASTER_SECRET flag before
updating the handshake hash when needed. Additionally, clear the
handshake hash when processing the Client Hello just to make sure that
any previous state is gone.

Fixes #18059

(cherry picked from commit 62100da7)

[skip ci]

[skip ci]

Gerald Combs authored Jan 18, 2022 and Gerald Combs committed May 04, 2022

Make sure the file we attempt to execute is the one we include with
our installer. Fixes #17893.

(cherry picked from commit 91463dde)

Gerald Combs authored Nov 25, 2021 and Gerald Combs committed May 04, 2022

If the Visual C++ Redistributable installation fails, don't point users
to KB2999226. It applied to Windows 8.1 and earlier, and is more likely
to cause confusion than help fix the problem. Ping #17748.

(cherry picked from commit 5e345d39)

[skip ci]

[skip ci]

Update manuf, services enterprise numbers, translations, and other items.

Jim Young authored Feb 06, 2022 and A Wireshark GitLab Utility committed Apr 29, 2022

(cherry picked from commit 42106c96)

Remove some leftover references to configure in the INSTALL file
and README.* files in root directory.


(cherry picked from commit 1e0f5799)

Joakim Karlsson authored Apr 26, 2022 and Pascal Quantin committed Apr 26, 2022

(cherry picked from commit 74fd19fb)

Alexis La Goutte authored Apr 24, 2022 and Gerald Combs committed Apr 25, 2022

Duplicate Dialog Token field

Fix #18050


(cherry picked from commit 19dc602f)

Fix some deprecated and obsolete syntax from the rpm specfile that
modern distributions complain about:
Don't specify the BuildRoot
Don't have a %clean section
Don't remove the BuildRoot at the start of %install
Don't repeat Name in summary
Version the Obsoletes
Have a %build section
Escape macros in changelog
Remove comment about user setting _smp_mflags since rpm does that
automatically better now
Be consistent about spaces and tabs (tabs are used)

(cherry picked from commit 858a670d)

SUSE 15.1 moved to out of source builds, and sets a builddir
appropriately, but it makes some decisions about automatically
entering the build dir when building or installing that are
handled by the distribution's various Make and Ninja macros
differently than other distributions and later SUSE releases.
Work around it, so that both ninja and make builds work on
SUSE 15.1 (both OpenSUSE and SLES)

Related to #17910


(cherry picked from commit 7ec3e841)

RHEL 8 and derivatives have supported the various CMake macros since
8.4 (June 2021, see https://access.redhat.com/errata/RHEA-2021:1747)
Use them there as well, so that we have a unified spec file for all
recent distributions (with the older RHEL/CentOS 7 and SLES 12 being
the only exceptions.)


(cherry picked from commit 92c8c2f7)

(cherry picked from commit 968f40d3)

Moshe Kaplan authored Dec 19, 2021 and Gerald Combs committed Apr 25, 2022

Repeated words were found with:
egrep "(\b[a-zA-Z]+) +\1\b" . -Ir
and then manually reviewed.
Non-displayed strings (e.g., in comments)
were also corrected, to ease future review.

(Partial cherry-pick of 69d54d6f)

Quote <code> spans with backticks and <span class=menuseq> spans with
double quotes.

(cherry picked from commit 51e1381b)

Conflicts:
	NEWS

Be a bit more precise about what's wrong with bindir on SUSE
(when prefix is /usr/local or anything else.)


(cherry picked from commit 65e3c4fb)

Fedora and SUSE 15 use out of source builds by default, but store
the build directory in differently named macros. Define one macro
for the build directory that has the appropriate value (which will
be "." for any distribution that doesn't have either macro, and
thus presumably does in-source builds.) This fixes building and
installing the guides with any of the supported distributions.

Also, since RHEL/CentOS 7 doesn't have a special CMake macro, it
needs to set the install prefix when calling cmake.

Also, fix a comment warning by escaping the percent sign.


(cherry picked from commit 1d0fb38d)

The HTML guides require xsltproc and the docbook xsl stylesheets
in order to be generated.


(cherry picked from commit 80052413)

We require glib2 version 2.38 now, increase the version requirement
in the RPM spec file to match.


(cherry picked from commit 4b5d54f5)

John Thacker authored Jan 05, 2022 and A Wireshark GitLab Utility committed Apr 24, 2022

Automatic dependency generation has been around since RPM 4.0 (September
2000). The BuildRequires are sufficient for all of these; the automatic
dependences for the .so files works and are superior as they are versioned.

Red Hat and SUSE both recommend using automatic dependencies and
avoiding unnecessary Requires in spec files:
https://docs.fedoraproject.org/en-US/packaging-guidelines/#_explicit_requires
https://en.opensuse.org/openSUSE:Package_dependencies

(based on commit 2cb8f347 with slight
differences since 3.6 does not require pcre2)