1. 19 May, 2022 1 commit
    • John Thacker's avatar
      QT: Default sort simple stat tables by first column ascending · fa819751
      John Thacker authored
      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)
  2. 18 May, 2022 1 commit
  3. 17 May, 2022 1 commit
    • Roland Knall's avatar
      Qt: Fix File Path editor in table · d8d655a6
      Roland Knall authored and Roland Knall's avatar Roland Knall committed
      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
  4. 16 May, 2022 6 commits
    • Roland Knall's avatar
      extcap: Close pipe on windows properly · 7cfb215b
      Roland Knall authored and Gerald Combs's avatar Gerald Combs committed
      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.
      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
      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's avatar
      Tools: Don't validate file_util.c. · f6a65b78
      Gerald Combs authored and Gerald Combs's avatar Gerald Combs committed
      It's Windows-only.
      (cherry picked from commit 6c612bf2)
    • Gerald Combs's avatar
      Tools: Only validate a file if we have a build rule for it. · 029f874c
      Gerald Combs authored and Gerald Combs's avatar Gerald Combs committed
      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's avatar
      Validate only real C files, not templates · 5b7b836e
      Jaap Keuter authored and Gerald Combs's avatar Gerald Combs committed
      (cherry picked from commit a4cbf047)
    • Anders Broman's avatar
      Ignore packet-PROTOABBREV.c · 2de4d3e6
      Anders Broman authored and Gerald Combs's avatar Gerald Combs committed
      (cherry picked from commit b5928542)
    • Zoran Bošnjak's avatar
      asterix: Dissector automatic update from spec files · 80ba02ed
      Zoran Bošnjak authored and Gerald Combs's avatar Gerald Combs committed
      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)
  5. 15 May, 2022 1 commit
  6. 12 May, 2022 2 commits
  7. 11 May, 2022 1 commit
    • Roland Knall's avatar
      Qt: Fix display filter read/write · 25515d21
      Roland Knall authored
      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)
  8. 08 May, 2022 1 commit
  9. 06 May, 2022 1 commit
  10. 05 May, 2022 3 commits
    • Peter Wu's avatar
      TLS: fix RSA decryption with EMS and renegotiation · 3d310e89
      Peter Wu authored
      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)
    • Gerald Combs's avatar
      Version: 3.6.5 → 3.6.6 · e7919534
      Gerald Combs authored
      [skip ci]
    • Gerald Combs's avatar
      Build: 3.6.5 · 21f79ddb
      Gerald Combs authored
      [skip ci]
  11. 04 May, 2022 4 commits
  12. 02 May, 2022 1 commit
  13. 01 May, 2022 1 commit
  14. 29 Apr, 2022 3 commits
  15. 26 Apr, 2022 1 commit
  16. 25 Apr, 2022 8 commits
    • Alexis La Goutte's avatar
      802.11: fix TWT Setup dissection · ae9bd163
      Alexis La Goutte authored and Gerald Combs's avatar Gerald Combs committed
      Duplicate Dialog Token field
      Fix #18050
      (cherry picked from commit 19dc602f)
    • John Thacker's avatar
      rpm: Specfile cleanup · 6114ebfd
      John Thacker authored
      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)
    • John Thacker's avatar
      rpm: Fix SUSE 15.1 builddir issue on make · cf58e4aa
      John Thacker authored
      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)
    • John Thacker's avatar
      rpm: RHEL 8 update macros · 00773134
      John Thacker authored
      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)
    • Gerald Combs's avatar
      Tools: Handle table rows and admonition titles in html2text. · 8b9c8ff0
      Gerald Combs authored
      (cherry picked from commit 968f40d3)
    • Moshe Kaplan's avatar
      Corrects repeated words throughout the code. · fd33d9ab
      Moshe Kaplan authored and Gerald Combs's avatar Gerald Combs committed
      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)
    • Gerald Combs's avatar
      Tools: Quote some elements in html2text. · 3a3f6b06
      Gerald Combs authored
      Quote <code> spans with backticks and <span class=menuseq> spans with
      double quotes.
      (cherry picked from commit 51e1381b)
    • John Thacker's avatar
      rpm: expand comment · 89a2279b
      John Thacker authored
      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)
  17. 24 Apr, 2022 4 commits