CVS commit: pkgsrc/net/wireshark

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Nov 20 18:34:49 UTC 2023

Modified Files:
        pkgsrc/net/wireshark: Makefile PLIST distinfo options.mk
        pkgsrc/net/wireshark/patches: patch-CMakeLists.txt

Log Message:
wireshark: updated to 4.2.0

Wireshark 4.2.0 Release Notes

What’s New

 This is the first major Wireshark release under the Wireshark
 Foundation, a nonprofit which hosts Wireshark and promotes protocol
 analysis educaton. The foundation depends on your contributions in
 order to do its work. If you or your employer would like to contribute
 or become a sponsor, please visit wiresharkfoundation.org[1].

 Wireshark supports dark mode on Windows.

 A Windows installer for Arm64 has been added.

 Packet list sorting has been improved.

 Wireshark and TShark are now better about generating valid UTF-8
 output.

 A new display filter feature for filtering raw bytes has been added.

 Display filter autocomplete is smarter about not suggesting invalid
 syntax.

 "Tools › MAC Address Blocks" can lookup a MAC address in the IEEE OUI
 registry.

 The enterprises, manuf, and services configuration files have been
 compiled in for improved start-up times. These files are no longer
 available in the master branch in our source code repository. You can
 download the manuf file[2] from our automated build directory.

 The installation target no longer installs development headers by
 default.

 The Wireshark installation is relocatable on Linux (and other ELF
 platforms with support for relative RPATHs).

 Wireshark can be compiled on Windows using MSYS2[3]. Check the
 Developer’s guide for instructions.

 Wireshark can be cross-compiled for Windows using Linux. Check the
 Developer’s guide for instructions.

 "Tools › Browser (SSL Keylog)" can launch your web browser with the
 SSLKEYLOGFILE environment variable set to the appropriate value.

 Windows installer file names now have the format
 Wireshark-<version>-<architecture>.exe.

 Wireshark now supports the Korean language.

 Many other improvements have been made. See the “New and Updated
 Features” section below for more details.

 Bug Fixes

  The following bugs have been fixed:

    • Issue 18413[4] - RTP player do not play audio frequently on
      Windows builds with Qt6.

    • Issue 18510[5] - Playback marker does not move after resume with
      Qt6.

 New and Updated Features

  The following features are new (or have been significantly updated)
  since version 4.2.0rc3:

    • Nothing of note.

  The following features are new (or have been significantly updated)
  since version 4.2.0rc2:

    • The Windows installers now ship with Npcap 1.78. They previously
      shipped with Npcap 1.77.

  The following features are new (or have been significantly updated)
  since version 4.2.0rc1:

    • The Windows installers now ship with Npcap 1.77. They previously
      shipped with Npcap 1.71.

  The following features are new (or have been significantly updated)
  since version 4.1.0:

    • Improved dark mode support.

    • The Windows installers now ship with Qt 6.5.3. They previously
      shipped with Qt 6.2.3.

  The following features are new (or have been significantly updated)
  since version 4.0.0:

    • The API has been updated to ensure that the dissection engine
      produces valid UTF-8 strings.

    • Wireshark now builds with Qt6 by default. To use Qt5 instead pass
      USE_qt6=OFF to CMake.

    • The "ciscodump" extcap supports Cisco IOS XE 17.x.

    • The default interval between GUI updates when capturing has been
      decreased from 500ms to 100ms, and is now configurable.

    • The -n option also now disables IP address geolocation
      information lookup in configured MaxMind databases (and
      geolocation lookup can be enabled with -Ng.) This is most
      relevant for TShark, where geolocation lookups are synchronous.

    • The display filter drop-down list is now sorted by "most recently
      used" instead of "most recently created".

    • Display filter syntax-related changes:

       • It is now possible to filter on raw packet data for any field
      by using the syntax `@some.field == <bytes…​>`. This can be
      useful to filter on malformed UTF-8 strings, among other use
      cases where it is necessary to look at the field’s raw data.

       • Negation (unary minus) now works with any display filter
      arithmetic expression.

       • Using the slice operator with strings produces a string.
      Previously it would produce a byte array. This is useful to
      index/slice UTF-8 multibyte strings. String byte slices can still
      be obtained using the "@" (raw operator) prefix.

       • Arithmetic expressions are allowed as set elements.

       • Absolute date and time values can be written as Unix time.

       • The limitation where a minus sign needed to be preceded by a
      space character has been removed.

       • Added XOR logical operator.

       • Fixed the implementation of `all …​ in` membership operator

       • When parsing absolute time values the display filter engine
      has learned to understand timezones as specified in
      strptime(3)[7], including some common North American
      designations. Arbitrary timezone names are not supported however.
      Previously only ISO8601 offsets and the "UTC" designation was
      understood.

       • Writing value strings without double quotes is deprecated and
      will generate a warning. Value strings are integer or boolean
      values that can be represented using a user-friendly textual
      format, such as "Set"/"Unset" instead of numerical values like 1
      and 0. It is now a requirement that value strings need to be
      written enclosed in double-quotes.

       • The deprecated ~≃ operator symbol has been removed. It was
      replaced by !== in version 4.0.

    • Running the test suite requires the pytest[8] Python module. The
      emulation layer that allowed running tests without pytest
      installed has been removed.

    • When saving files or exporting packets after changing their time
      with the "Time Shift" dialog, the shifted time is written to the
      new file.

    • TLS secrets used in decrypting packets can be embedded (or
      discarded) from the capture file via the GUI, similar to the
      options --inject-secrets and --discard-all-secrets in editcap.

    • The text of any configured column (displayed or hidden) can be
      filtered anywhere that filters are used - in display filters,
      filters in taps, coloring rules, Wireshark read filters, and the
      -Y, -R, and -e options to TShark, the "Apply as Filter" GUI
      option, etc.

       • The filter field names are prefixed by "_ws.col", followed by
      a lowercase version of the COL_ name found in
      epan/column-utils.h, e.g. "_ws.col.info" or "_ws.col.protocol"

       • Using the column names as a filter is slower than other filter
      types because the columns must be constructed, so when the same
      filtering can be achieved via other fields, prefer that.

    • The external name resolution text files "manuf", "enterprises"
      and "services" have been removed and replaced with static binary
      data. You can dump the respective internal data using `tshark -G
      manuf|enterprises|services`.

    • The "manuf" file is now also read from the personal configuration
      folder, and is profile-based.

    • The Lua console dialogs under the Tools menu were refactored and
      redesigned. It now consists of a single dialog window for input
      and output.

    • Wireshark now shows byte units in the statistics in the
      user-selected language (uses the system default language by
      default).

    • Packet list sorting has been improved:

       • When sorting packet list with a filter applied, only the
      visible packets are sorted, which greatly increases sorting
      speed.

       • The cache size for column text is limited to a default of
      10000 rows, which limits the maximum memory usage. The maximum
      value can be changed in Preferences→Appearance→Layout

       • Due to the above, columns that require packet dissection can
      only be sorted if the number of visible rows is less than the
      cache size. If there are more rows visible, a warning will
      appear. Columns that do not require packet dissection (those that
      calculated directly from the capture file frame headers, such as
      packet number, time, and frame length) can be sorted with any
      number of visible rows.

       • Sorting can be interrupted.

    • When changing the dissector via the "Decode As" table for values
      that have default dissectors registered, selecting "(none)" will
      select no dissection (while still allowing heuristic dissectors
      to attempt to dissect.) The previous behavior was to reset the
      dissector to the default. To facilitate resetting the dissector,
      the default dissector is now sorted at the top of the list of
      possible dissector options.

    • The personal extcap plugin folder location on Unix has been
      changed to follow existing conventions for architecture-dependent
      files. The extcap personal folder is now
      `$HOME/.local/lib/wireshark/extcap`. Previously it was
      `$XDG_CONFIG_HOME/wireshark/extcap`.

    • The "init.lua" file is now loaded from any of the Lua plugin
      directories. Previously it was loaded from the personal
      configuration directory. (For backward-compatibility this is
      still allowed; note that deprecated features may be removed in a
      future release).

    • Installation of development headers must be done explicitly using
      the CMake command `cmake --install <builddir> --component
      Development`.

    • The Windows build has a new SpeexDSP external dependency
      (https://www.speex.org). The speex code that was previously
      bundled has been removed.

    • New `--print-timers` option added to TShark.

 Removed Features and Support

    • With the addition of the universal and consistent filtering
      support for column text, the previous support in the -e option to
      TShark for displaying column text via the column title has been
      removed in general. Those field names cannot be used elsewhere
      (as they may not be legal filter names) and create confusion if
      more than one column has the same title or if a column is
      renamed. Prefer the column format instead, e.g. "_ws.col.info"
      for "_ws.col.Info". However, for backwards compatibility with
      existing tools and scripts, the titles of the default columns can
      continue to be used with `tshark -e` (but not elsewhere.)

    • The bundled script "dtd_gen.lua" that was disabled by default has
      been removed from the installation. It can be found in the
      Wireshark Wiki under "Contrib"[9].

    • The Wi-Fi NAN dissector filter name has been changed from 'nan'
      to 'wifi_nan'.

 New File Format Decoding Support

  RTPDump

 New Protocol Support

  Aruba UBT, ASAM Capture Module Protocol (CMP), ATSC Link-Layer
  Protocol (ALP), DECT DLC protocol layer (DECT-DLC), DECT NWK protocol
  layer (DECT-NWK), DECT proprietary Mitel OMM/RFP Protocol (also named
  AaMiDe), Digital Object Identifier Resolution Protocol (DO-IRP),
  Discard Protocol, FiRa UWB Controller Interface (UCI), FiveCo’s
  Register Access Protocol (5CoRAP), Fortinet FortiGate Cluster
  Protocol (FGCP), GPS L1 C/A LNAV navigation messages, GSM Radio Link
  Protocol (RLP), H.224, High Speed Fahrzeugzugang (HSFZ), Hypertext
  Transfer Protocol version 3 (HTTP/3), ID3v2, IEEE 802.1CB (R-TAG),
  Iperf3, JSON 3GPP, Low Level Signalling (ATSC3 LLS), Management
  Component Transport Protocol (MCTP), Management Component Transport
  Protocol - Control Protocol (MCTP CP), Matter home automation
  protocol, Microsoft Delivery Optimization, Multi-Drop Bus (MDB),
  Non-volatile Memory Express - Management Interface (NVMe-MI) over
  MCTP, RDP audio output virtual channel Protocol (rdpsnd), RDP
  clipboard redirection channel Protocol (cliprdr), RDP Program virtual
  channel Protocol (RAIL), SAP Enqueue Server (SAPEnqueue), SAP GUI
  (SAPDiag), SAP HANA SQL Command Network Protocol (SAPHDB), SAP
  Internet Graphic Server (SAP IGS), SAP Message Server (SAPMS), SAP
  Network Interface (SAPNI), SAP Router (SAPROUTER), SAP Secure Network
  Connection (SNC), SBAS L1 Navigation Messages (SBAS L1), SINEC AP1
  Protocol (SINEC AP), SMPTE ST2110-20 (Uncompressed Active Video),
  Train Real-Time Data Protocol (TRDP), UBX protocol of u-blox GNSS
  receivers (UBX), UDP Tracker Protocol for BitTorrent (BT-Tracker),
  UWB UCI Protocol, Video Protocol 9 (VP9), VMware HeartBeat, Windows
  Delivery Optimization (MS-DO), Z21 LAN Protocol (Z21), Zabbix, ZigBee
  Direct (ZBD), and Zigbee TLV

 Updated Protocol Support

    • JSON: The dissector now has a preference to enable/disable
      "unescaping" of string values. By default it is off. Previously
      it was always on.

    • JSON: The dissector now supports "Display JSON in raw form".

    • IPv6: The dissector has a new preference to show some semantic
      details about addresses (default off).

    • IPv6: The dissector now supports dissecting the Application-aware
      IPv6 Networking (APN6) option[10] in the Hop-by-Hop Options
      Header (HBH) and Destination Options Header (DOH), including all
      three types of APN ID, which are 32-bit, 64-bit and 128-bit in
      length.

    • XML: The dissector now supports display character according to
      the "encoding" attribute of the XML declaration, and has a new
      preference to set default character encoding for some XML
      document without "encoding" attribute.

    • SIP: The dissector now has a new preference to set default
      charset for displaying the body of SIP messages in raw text view.

    • HTTP: The dissector now supports dissecting chunked data in
      streaming reassembly mode. Subdissectors of HTTP can register
      itself in "streaming_content_type" subdissector table for
      enabling streaming reassembly mode while transferring in chunked
      encoding. This feature ensures the server stream messages of
      GRPC-Web over HTTP/1.1 can be dissected even if the last chunk is
      absent.

    • The media type dissector table now properly treats media types
      and subtypes as case-insensitive automatically, per RFC 6838.
      Media types no longer need to be lower cased before registering
      or looking up in the table.

    • CFM: The dissector has been overhauled and updated to the level
      of IEEE std 802.1Q-2022 and ITU-T Rec. G.8013/Y.1371 (08/2015).
      This includes dissection of additional PDU types and TLVs as well
      as deeper dissection of existing PDUs and TLVs.

  Too many other protocol updates have been made to list them all here.

 New and Updated Codec support

  Adaptive Multi-Rate (AMR), if compiled with opencore-amr[11].

 Major API Changes

    • Lua function "package.prepend_path" has been removed. If you need
      it please consider adding your own package.path customization
      code or installing your dependencies in Wireshark’s default
      paths.

    • The reassemble_streaming_data_and_call_subdissector() API has
      been added to provide a simpler way to reassemble the streaming
      data of a high level protocol that is not on top of TCP.

    • Some of the API now uses C99 types instead of GLib types. Issue
      19116[12]


To generate a diff of this commit:
cvs rdiff -u -r1.305 -r1.306 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/net/wireshark/PLIST
cvs rdiff -u -r1.168 -r1.169 pkgsrc/net/wireshark/distinfo
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/wireshark/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.305 pkgsrc/net/wireshark/Makefile:1.306
--- pkgsrc/net/wireshark/Makefile:1.305 Sun Nov 12 13:23:15 2023
+++ pkgsrc/net/wireshark/Makefile       Mon Nov 20 18:34:49 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.305 2023/11/12 13:23:15 wiz Exp $
+# $NetBSD: Makefile,v 1.306 2023/11/20 18:34:49 adam Exp $
 
-DISTNAME=      wireshark-4.0.10
-PKGREVISION=   4
+DISTNAME=      wireshark-4.2.0
 CATEGORIES=    net
 MASTER_SITES=  https://www.wireshark.org/download/src/
 EXTRACT_SUFX=  .tar.xz
@@ -13,6 +12,8 @@ LICENSE=      gnu-gpl-v2
 
 CONFLICTS+=    ethereal-[0-9]*
 
+DEPENDS+=      lemon-[0-9]*:../../devel/lemon
+
 CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=           -DENABLE_APPLICATION_BUNDLE=OFF
 CMAKE_ARGS+=           -DVCSVERSION_OVERRIDE=${PKGVERSION_NOREV}
@@ -63,13 +64,20 @@ BUILDLINK_API_DEPENDS.zlib+=        zlib>=1.2.1
 # [-Wint-conversion]
 BUILDLINK_TRANSFORM+=  rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
 
-.include "../../devel/cmake/build.mk"
+SUBST_CLASSES+=                lemon
+SUBST_STAGE.lemon=     pre-configure
+SUBST_MESSAGE.lemon=   Fixing hard-coded path to lemon/lempar.c.
+SUBST_FILES.lemon=     cmake/modules/UseLemon.cmake
+SUBST_SED.lemon=       -e 's,/usr/share,${PREFIX}/share,g'
+
 .include "../../archivers/brotli/buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/minizip/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../audio/libopus/buildlink3.mk"
+.include "../../audio/opencore-amr/buildlink3.mk"
 .include "../../audio/speexdsp/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libsmi/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"

Index: pkgsrc/net/wireshark/PLIST
diff -u pkgsrc/net/wireshark/PLIST:1.84 pkgsrc/net/wireshark/PLIST:1.85
--- pkgsrc/net/wireshark/PLIST:1.84     Fri Oct  6 12:39:03 2023
+++ pkgsrc/net/wireshark/PLIST  Mon Nov 20 18:34:49 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.84 2023/10/06 12:39:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.85 2023/11/20 18:34:49 adam Exp $
 bin/capinfos
 bin/captype
 bin/dumpcap
@@ -13,686 +13,46 @@ bin/sharkd
 bin/text2pcap
 bin/tshark
 ${PLIST.qt}bin/wireshark
-include/wireshark/cfile.h
-include/wireshark/cli_main.h
-include/wireshark/epan/addr_and_mask.h
-include/wireshark/epan/addr_resolv.h
-include/wireshark/epan/address.h
-include/wireshark/epan/address_types.h
-include/wireshark/epan/afn.h
-include/wireshark/epan/aftypes.h
-include/wireshark/epan/app_mem_usage.h
-include/wireshark/epan/arcnet_pids.h
-include/wireshark/epan/arptypes.h
-include/wireshark/epan/asn1.h
-include/wireshark/epan/ax25_pids.h
-include/wireshark/epan/bridged_pids.h
-include/wireshark/epan/capture_dissectors.h
-include/wireshark/epan/charsets.h
-include/wireshark/epan/chdlctypes.h
-include/wireshark/epan/cisco_pid.h
-include/wireshark/epan/color_filters.h
-include/wireshark/epan/column-info.h
-include/wireshark/epan/column-utils.h
-include/wireshark/epan/column.h
-include/wireshark/epan/conv_id.h
-include/wireshark/epan/conversation.h
-include/wireshark/epan/conversation_debug.h
-include/wireshark/epan/conversation_filter.h
-include/wireshark/epan/conversation_table.h
-include/wireshark/epan/crc10-tvb.h
-include/wireshark/epan/crc16-tvb.h
-include/wireshark/epan/crc32-tvb.h
-include/wireshark/epan/crc6-tvb.h
-include/wireshark/epan/crc8-tvb.h
-include/wireshark/epan/dccpservicecodes.h
-include/wireshark/epan/decode_as.h
-include/wireshark/epan/dfilter/dfilter.h
-include/wireshark/epan/dfilter/drange.h
-include/wireshark/epan/diam_dict.h
-include/wireshark/epan/disabled_protos.h
-include/wireshark/epan/dissectors/cond_ace_token_enum.h
-include/wireshark/epan/dissectors/file-pcapng.h
-include/wireshark/epan/dissectors/file-rbm.h
-include/wireshark/epan/dissectors/packet-6lowpan.h
-include/wireshark/epan/dissectors/packet-a21.h
-include/wireshark/epan/dissectors/packet-acdr.h
-include/wireshark/epan/dissectors/packet-acp133.h
-include/wireshark/epan/dissectors/packet-acse.h
-include/wireshark/epan/dissectors/packet-actrace.h
-include/wireshark/epan/dissectors/packet-adb_service.h
-include/wireshark/epan/dissectors/packet-afp.h
-include/wireshark/epan/dissectors/packet-alcap.h
-include/wireshark/epan/dissectors/packet-amp.h
-include/wireshark/epan/dissectors/packet-ansi_a.h
-include/wireshark/epan/dissectors/packet-ansi_map.h
-include/wireshark/epan/dissectors/packet-ansi_tcap.h
-include/wireshark/epan/dissectors/packet-arp.h
-include/wireshark/epan/dissectors/packet-asap+enrp-common.h
-include/wireshark/epan/dissectors/packet-atalk.h
-include/wireshark/epan/dissectors/packet-atm.h
-include/wireshark/epan/dissectors/packet-atn-ulcs.h
-include/wireshark/epan/dissectors/packet-autosar-ipdu-multiplexer.h
-include/wireshark/epan/dissectors/packet-bacapp.h
-include/wireshark/epan/dissectors/packet-bacnet.h
-include/wireshark/epan/dissectors/packet-bblog.h
-include/wireshark/epan/dissectors/packet-ber.h
-include/wireshark/epan/dissectors/packet-bfd.h
-include/wireshark/epan/dissectors/packet-bgp.h
-include/wireshark/epan/dissectors/packet-bicc_mst.h
-include/wireshark/epan/dissectors/packet-bluetooth.h
-include/wireshark/epan/dissectors/packet-bpsec.h
-include/wireshark/epan/dissectors/packet-bpv6.h
-include/wireshark/epan/dissectors/packet-bpv7.h
-include/wireshark/epan/dissectors/packet-bssap.h
-include/wireshark/epan/dissectors/packet-bssgp.h
-include/wireshark/epan/dissectors/packet-btatt.h
-include/wireshark/epan/dissectors/packet-btavctp.h
-include/wireshark/epan/dissectors/packet-btavdtp.h
-include/wireshark/epan/dissectors/packet-btavrcp.h
-include/wireshark/epan/dissectors/packet-btbredr_rf.h
-include/wireshark/epan/dissectors/packet-bthci_acl.h
-include/wireshark/epan/dissectors/packet-bthci_cmd.h
-include/wireshark/epan/dissectors/packet-bthci_evt.h
-include/wireshark/epan/dissectors/packet-bthci_iso.h
-include/wireshark/epan/dissectors/packet-bthci_sco.h
-include/wireshark/epan/dissectors/packet-btl2cap.h
-include/wireshark/epan/dissectors/packet-btle.h
-include/wireshark/epan/dissectors/packet-btrfcomm.h
-include/wireshark/epan/dissectors/packet-btsdp.h
-include/wireshark/epan/dissectors/packet-c1222.h
-include/wireshark/epan/dissectors/packet-camel.h
-include/wireshark/epan/dissectors/packet-cdt.h
-include/wireshark/epan/dissectors/packet-cell_broadcast.h
-include/wireshark/epan/dissectors/packet-charging_ase.h
-include/wireshark/epan/dissectors/packet-chdlc.h
-include/wireshark/epan/dissectors/packet-cip.h
-include/wireshark/epan/dissectors/packet-cipsafety.h
-include/wireshark/epan/dissectors/packet-cmip.h
-include/wireshark/epan/dissectors/packet-cmp.h
-include/wireshark/epan/dissectors/packet-cms.h
-include/wireshark/epan/dissectors/packet-coap.h
-include/wireshark/epan/dissectors/packet-cose.h
-include/wireshark/epan/dissectors/packet-credssp.h
-include/wireshark/epan/dissectors/packet-crmf.h
-include/wireshark/epan/dissectors/packet-csn1.h
-include/wireshark/epan/dissectors/packet-dap.h
-include/wireshark/epan/dissectors/packet-dcc.h
-include/wireshark/epan/dissectors/packet-dccp.h
-include/wireshark/epan/dissectors/packet-dcerpc-browser.h
-include/wireshark/epan/dissectors/packet-dcerpc-budb.h
-include/wireshark/epan/dissectors/packet-dcerpc-butc.h
-include/wireshark/epan/dissectors/packet-dcerpc-dce122.h
-include/wireshark/epan/dissectors/packet-dcerpc-dnsserver.h
-include/wireshark/epan/dissectors/packet-dcerpc-frsapi.h
-include/wireshark/epan/dissectors/packet-dcerpc-frsrpc.h
-include/wireshark/epan/dissectors/packet-dcerpc-netlogon.h
-include/wireshark/epan/dissectors/packet-dcerpc-nt.h
-include/wireshark/epan/dissectors/packet-dcerpc-pnp.h
-include/wireshark/epan/dissectors/packet-dcerpc-rras.h
-include/wireshark/epan/dissectors/packet-dcerpc-samr.h
-include/wireshark/epan/dissectors/packet-dcerpc-spoolss.h
-include/wireshark/epan/dissectors/packet-dcerpc-svcctl.h
-include/wireshark/epan/dissectors/packet-dcerpc-tapi.h
-include/wireshark/epan/dissectors/packet-dcerpc.h
-include/wireshark/epan/dissectors/packet-dcom-dispatch.h
-include/wireshark/epan/dissectors/packet-dcom.h
-include/wireshark/epan/dissectors/packet-diameter.h
-include/wireshark/epan/dissectors/packet-diameter_3gpp.h
-include/wireshark/epan/dissectors/packet-diffserv-mpls-common.h
-include/wireshark/epan/dissectors/packet-disp.h
-include/wireshark/epan/dissectors/packet-dlt.h
-include/wireshark/epan/dissectors/packet-dns.h
-include/wireshark/epan/dissectors/packet-docsis-tlv.h
-include/wireshark/epan/dissectors/packet-doip.h
-include/wireshark/epan/dissectors/packet-dop.h
-include/wireshark/epan/dissectors/packet-dsp.h
-include/wireshark/epan/dissectors/packet-dtls.h
-include/wireshark/epan/dissectors/packet-dvbci.h
-include/wireshark/epan/dissectors/packet-e164.h
-include/wireshark/epan/dissectors/packet-e1ap.h
-include/wireshark/epan/dissectors/packet-e212.h
-include/wireshark/epan/dissectors/packet-eapol.h
-include/wireshark/epan/dissectors/packet-edonkey.h
-include/wireshark/epan/dissectors/packet-eigrp.h
-include/wireshark/epan/dissectors/packet-enip.h
-include/wireshark/epan/dissectors/packet-epl.h
-include/wireshark/epan/dissectors/packet-epmd.h
-include/wireshark/epan/dissectors/packet-erf.h
-include/wireshark/epan/dissectors/packet-ess.h
-include/wireshark/epan/dissectors/packet-eth.h
-include/wireshark/epan/dissectors/packet-f1ap.h
-include/wireshark/epan/dissectors/packet-f5ethtrailer.h
-include/wireshark/epan/dissectors/packet-fc.h
-include/wireshark/epan/dissectors/packet-fcbls.h
-include/wireshark/epan/dissectors/packet-fcct.h
-include/wireshark/epan/dissectors/packet-fcels.h
-include/wireshark/epan/dissectors/packet-fcfcs.h
-include/wireshark/epan/dissectors/packet-fcfzs.h
-include/wireshark/epan/dissectors/packet-fclctl.h
-include/wireshark/epan/dissectors/packet-fcsb3.h
-include/wireshark/epan/dissectors/packet-fcswils.h
-include/wireshark/epan/dissectors/packet-ff.h
-include/wireshark/epan/dissectors/packet-fix.h
-include/wireshark/epan/dissectors/packet-flexray.h
-include/wireshark/epan/dissectors/packet-fmp.h
-include/wireshark/epan/dissectors/packet-frame.h
-include/wireshark/epan/dissectors/packet-ftam.h
-include/wireshark/epan/dissectors/packet-ftdi-ft.h
-include/wireshark/epan/dissectors/packet-gdt.h
-include/wireshark/epan/dissectors/packet-geonw.h
-include/wireshark/epan/dissectors/packet-giop.h
-include/wireshark/epan/dissectors/packet-gluster.h
-include/wireshark/epan/dissectors/packet-gmr1_common.h
-include/wireshark/epan/dissectors/packet-gmr1_rr.h
-include/wireshark/epan/dissectors/packet-gprscdr.h
-include/wireshark/epan/dissectors/packet-gre.h
-include/wireshark/epan/dissectors/packet-gsm_a_common.h
-include/wireshark/epan/dissectors/packet-gsm_a_rr.h
-include/wireshark/epan/dissectors/packet-gsm_map.h
-include/wireshark/epan/dissectors/packet-gsm_rlcmac.h
-include/wireshark/epan/dissectors/packet-gsm_sms.h
-include/wireshark/epan/dissectors/packet-gsmtap.h
-include/wireshark/epan/dissectors/packet-gssapi.h
-include/wireshark/epan/dissectors/packet-gtp.h
-include/wireshark/epan/dissectors/packet-gtpv2.h
-include/wireshark/epan/dissectors/packet-h223.h
-include/wireshark/epan/dissectors/packet-h225.h
-include/wireshark/epan/dissectors/packet-h235.h
-include/wireshark/epan/dissectors/packet-h245.h
-include/wireshark/epan/dissectors/packet-h248.h
-include/wireshark/epan/dissectors/packet-h263.h
-include/wireshark/epan/dissectors/packet-h264.h
-include/wireshark/epan/dissectors/packet-h265.h
-include/wireshark/epan/dissectors/packet-h323.h
-include/wireshark/epan/dissectors/packet-h450-ros.h
-include/wireshark/epan/dissectors/packet-hpext.h
-include/wireshark/epan/dissectors/packet-http.h
-include/wireshark/epan/dissectors/packet-http2.h
-include/wireshark/epan/dissectors/packet-iana-oui.h
-include/wireshark/epan/dissectors/packet-iax2.h
-include/wireshark/epan/dissectors/packet-icmp.h
-include/wireshark/epan/dissectors/packet-idmp.h
-include/wireshark/epan/dissectors/packet-idp.h
-include/wireshark/epan/dissectors/packet-ieee1609dot2.h
-include/wireshark/epan/dissectors/packet-ieee80211-radio.h
-include/wireshark/epan/dissectors/packet-ieee80211-radiotap-defs.h
-include/wireshark/epan/dissectors/packet-ieee80211-radiotap-iter.h
-include/wireshark/epan/dissectors/packet-ieee80211.h
-include/wireshark/epan/dissectors/packet-ieee802154.h
-include/wireshark/epan/dissectors/packet-ieee8023.h
-include/wireshark/epan/dissectors/packet-ieee802a.h
-include/wireshark/epan/dissectors/packet-igmp.h
-include/wireshark/epan/dissectors/packet-imf.h
-include/wireshark/epan/dissectors/packet-inap.h
-include/wireshark/epan/dissectors/packet-infiniband.h
-include/wireshark/epan/dissectors/packet-ip.h
-include/wireshark/epan/dissectors/packet-ipmi.h
-include/wireshark/epan/dissectors/packet-ipsec.h
-include/wireshark/epan/dissectors/packet-ipx.h
-include/wireshark/epan/dissectors/packet-isakmp.h
-include/wireshark/epan/dissectors/packet-isis-clv.h
-include/wireshark/epan/dissectors/packet-isis.h
-include/wireshark/epan/dissectors/packet-isl.h
-include/wireshark/epan/dissectors/packet-iso10681.h
-include/wireshark/epan/dissectors/packet-iso15765.h
-include/wireshark/epan/dissectors/packet-isup.h
-include/wireshark/epan/dissectors/packet-its.h
-include/wireshark/epan/dissectors/packet-iwarp-ddp-rdmap.h
-include/wireshark/epan/dissectors/packet-juniper.h
-include/wireshark/epan/dissectors/packet-jxta.h
-include/wireshark/epan/dissectors/packet-kerberos.h
-include/wireshark/epan/dissectors/packet-knxip.h
-include/wireshark/epan/dissectors/packet-knxip_decrypt.h
-include/wireshark/epan/dissectors/packet-l2tp.h
-include/wireshark/epan/dissectors/packet-lapdm.h
-include/wireshark/epan/dissectors/packet-lbm.h
-include/wireshark/epan/dissectors/packet-lbtrm.h
-include/wireshark/epan/dissectors/packet-lbtru.h
-include/wireshark/epan/dissectors/packet-lbttcp.h
-include/wireshark/epan/dissectors/packet-lcsap.h
-include/wireshark/epan/dissectors/packet-ldap.h
-include/wireshark/epan/dissectors/packet-ldp.h
-include/wireshark/epan/dissectors/packet-lin.h
-include/wireshark/epan/dissectors/packet-link16.h
-include/wireshark/epan/dissectors/packet-lisp.h
-include/wireshark/epan/dissectors/packet-llc.h
-include/wireshark/epan/dissectors/packet-lnet.h
-include/wireshark/epan/dissectors/packet-logotypecertextn.h
-include/wireshark/epan/dissectors/packet-lpp.h
-include/wireshark/epan/dissectors/packet-lppa.h
-include/wireshark/epan/dissectors/packet-lte-rrc.h
-include/wireshark/epan/dissectors/packet-mac-lte.h
-include/wireshark/epan/dissectors/packet-mausb.h
-include/wireshark/epan/dissectors/packet-mbim.h
-include/wireshark/epan/dissectors/packet-mbtcp.h
-include/wireshark/epan/dissectors/packet-mgcp.h
-include/wireshark/epan/dissectors/packet-mle.h
-include/wireshark/epan/dissectors/packet-mms.h
-include/wireshark/epan/dissectors/packet-mount.h
-include/wireshark/epan/dissectors/packet-mp4ves.h
-include/wireshark/epan/dissectors/packet-mpeg-descriptor.h
-include/wireshark/epan/dissectors/packet-mpeg-sect.h
-include/wireshark/epan/dissectors/packet-mpls.h
-include/wireshark/epan/dissectors/packet-mq.h
-include/wireshark/epan/dissectors/packet-msrp.h
-include/wireshark/epan/dissectors/packet-mstp.h
-include/wireshark/epan/dissectors/packet-mtp3.h
-include/wireshark/epan/dissectors/packet-nbap.h
-include/wireshark/epan/dissectors/packet-ncp-int.h
-include/wireshark/epan/dissectors/packet-ncp-nmas.h
-include/wireshark/epan/dissectors/packet-ncp-sss.h
-include/wireshark/epan/dissectors/packet-ndmp.h
-include/wireshark/epan/dissectors/packet-ndps.h
-include/wireshark/epan/dissectors/packet-netbios.h
-include/wireshark/epan/dissectors/packet-netlink.h
-include/wireshark/epan/dissectors/packet-nfs.h
-include/wireshark/epan/dissectors/packet-ngap.h
-include/wireshark/epan/dissectors/packet-nisplus.h
-include/wireshark/epan/dissectors/packet-nlm.h
-include/wireshark/epan/dissectors/packet-nr-rrc.h
-include/wireshark/epan/dissectors/packet-nrppa.h
-include/wireshark/epan/dissectors/packet-nsh.h
-include/wireshark/epan/dissectors/packet-ntlmssp.h
-include/wireshark/epan/dissectors/packet-ntp.h
-include/wireshark/epan/dissectors/packet-nvme.h
-include/wireshark/epan/dissectors/packet-ocsp.h
-include/wireshark/epan/dissectors/packet-oer.h
-include/wireshark/epan/dissectors/packet-opensafety.h
-include/wireshark/epan/dissectors/packet-oscore.h
-include/wireshark/epan/dissectors/packet-osi-options.h
-include/wireshark/epan/dissectors/packet-osi.h
-include/wireshark/epan/dissectors/packet-p1.h
-include/wireshark/epan/dissectors/packet-p22.h
-include/wireshark/epan/dissectors/packet-p7.h
-include/wireshark/epan/dissectors/packet-p772.h
-include/wireshark/epan/dissectors/packet-pcap_pktdata.h
-include/wireshark/epan/dissectors/packet-pcnfsd.h
-include/wireshark/epan/dissectors/packet-pdcp-lte.h
-include/wireshark/epan/dissectors/packet-pdcp-nr.h
-include/wireshark/epan/dissectors/packet-pdu-transport.h
-include/wireshark/epan/dissectors/packet-per.h
-include/wireshark/epan/dissectors/packet-pkcs1.h
-include/wireshark/epan/dissectors/packet-pkcs12.h
-include/wireshark/epan/dissectors/packet-pkinit.h
-include/wireshark/epan/dissectors/packet-pkix1explicit.h
-include/wireshark/epan/dissectors/packet-pkix1implicit.h
-include/wireshark/epan/dissectors/packet-pkixac.h
-include/wireshark/epan/dissectors/packet-pkixproxy.h
-include/wireshark/epan/dissectors/packet-pkixqualified.h
-include/wireshark/epan/dissectors/packet-pkixtsp.h
-include/wireshark/epan/dissectors/packet-portmap.h
-include/wireshark/epan/dissectors/packet-ppi-geolocation-common.h
-include/wireshark/epan/dissectors/packet-ppp.h
-include/wireshark/epan/dissectors/packet-pres.h
-include/wireshark/epan/dissectors/packet-ptp.h
-include/wireshark/epan/dissectors/packet-ptpip.h
-include/wireshark/epan/dissectors/packet-pw-atm.h
-include/wireshark/epan/dissectors/packet-pw-common.h
-include/wireshark/epan/dissectors/packet-q708.h
-include/wireshark/epan/dissectors/packet-q931.h
-include/wireshark/epan/dissectors/packet-q932.h
-include/wireshark/epan/dissectors/packet-qsig.h
-include/wireshark/epan/dissectors/packet-quic.h
-include/wireshark/epan/dissectors/packet-radius.h
-include/wireshark/epan/dissectors/packet-raknet.h
-include/wireshark/epan/dissectors/packet-ranap.h
-include/wireshark/epan/dissectors/packet-rdm.h
-include/wireshark/epan/dissectors/packet-rdt.h
-include/wireshark/epan/dissectors/packet-reload.h
-include/wireshark/epan/dissectors/packet-rlc-lte.h
-include/wireshark/epan/dissectors/packet-rlc-nr.h
-include/wireshark/epan/dissectors/packet-rmi.h
-include/wireshark/epan/dissectors/packet-rmt-common.h
-include/wireshark/epan/dissectors/packet-rohc.h
-include/wireshark/epan/dissectors/packet-ros.h
-include/wireshark/epan/dissectors/packet-rpc.h
-include/wireshark/epan/dissectors/packet-rpcrdma.h
-include/wireshark/epan/dissectors/packet-rrc.h
-include/wireshark/epan/dissectors/packet-rsvp.h
-include/wireshark/epan/dissectors/packet-rtcp.h
-include/wireshark/epan/dissectors/packet-rtp-events.h
-include/wireshark/epan/dissectors/packet-rtp.h
-include/wireshark/epan/dissectors/packet-rtse.h
-include/wireshark/epan/dissectors/packet-rtsp.h
-include/wireshark/epan/dissectors/packet-rx.h
-include/wireshark/epan/dissectors/packet-s1ap.h
-include/wireshark/epan/dissectors/packet-s5066sis.h
-include/wireshark/epan/dissectors/packet-s7comm.h
-include/wireshark/epan/dissectors/packet-s7comm_szl_ids.h
-include/wireshark/epan/dissectors/packet-sccp.h
-include/wireshark/epan/dissectors/packet-scsi-mmc.h
-include/wireshark/epan/dissectors/packet-scsi-osd.h
-include/wireshark/epan/dissectors/packet-scsi-sbc.h
-include/wireshark/epan/dissectors/packet-scsi-smc.h
-include/wireshark/epan/dissectors/packet-scsi-ssc.h
-include/wireshark/epan/dissectors/packet-scsi.h
-include/wireshark/epan/dissectors/packet-sctp.h
-include/wireshark/epan/dissectors/packet-sdp.h
-include/wireshark/epan/dissectors/packet-ses.h
-include/wireshark/epan/dissectors/packet-sflow.h
-include/wireshark/epan/dissectors/packet-sip.h
-include/wireshark/epan/dissectors/packet-skinny.h
-include/wireshark/epan/dissectors/packet-sll.h
-include/wireshark/epan/dissectors/packet-smb-browse.h
-include/wireshark/epan/dissectors/packet-smb-common.h
-include/wireshark/epan/dissectors/packet-smb-mailslot.h
-include/wireshark/epan/dissectors/packet-smb-pipe.h
-include/wireshark/epan/dissectors/packet-smb-sidsnooping.h
-include/wireshark/epan/dissectors/packet-smb.h
-include/wireshark/epan/dissectors/packet-smb2.h
-include/wireshark/epan/dissectors/packet-smpp.h
-include/wireshark/epan/dissectors/packet-smrse.h
-include/wireshark/epan/dissectors/packet-snmp.h
-include/wireshark/epan/dissectors/packet-socketcan.h
-include/wireshark/epan/dissectors/packet-someip.h
-include/wireshark/epan/dissectors/packet-spice.h
-include/wireshark/epan/dissectors/packet-sprt.h
-include/wireshark/epan/dissectors/packet-sscop.h
-include/wireshark/epan/dissectors/packet-stat-notify.h
-include/wireshark/epan/dissectors/packet-stat.h
-include/wireshark/epan/dissectors/packet-sv.h
-include/wireshark/epan/dissectors/packet-syslog.h
-include/wireshark/epan/dissectors/packet-t124.h
-include/wireshark/epan/dissectors/packet-t30.h
-include/wireshark/epan/dissectors/packet-t38.h
-include/wireshark/epan/dissectors/packet-tacacs.h
-include/wireshark/epan/dissectors/packet-tcap.h
-include/wireshark/epan/dissectors/packet-tcp.h
-include/wireshark/epan/dissectors/packet-tcpcl.h
-include/wireshark/epan/dissectors/packet-tecmp.h
-include/wireshark/epan/dissectors/packet-tetra.h
-include/wireshark/epan/dissectors/packet-thrift.h
-include/wireshark/epan/dissectors/packet-tls-utils.h
-include/wireshark/epan/dissectors/packet-tls.h
-include/wireshark/epan/dissectors/packet-tn3270.h
-include/wireshark/epan/dissectors/packet-tn5250.h
-include/wireshark/epan/dissectors/packet-tpkt.h
-include/wireshark/epan/dissectors/packet-tr.h
-include/wireshark/epan/dissectors/packet-tte.h
-include/wireshark/epan/dissectors/packet-ua.h
-include/wireshark/epan/dissectors/packet-uaudp.h
-include/wireshark/epan/dissectors/packet-uavcan-dsdl.h
-include/wireshark/epan/dissectors/packet-ubertooth.h
-include/wireshark/epan/dissectors/packet-udp.h
-include/wireshark/epan/dissectors/packet-uds.h
-include/wireshark/epan/dissectors/packet-umts_fp.h
-include/wireshark/epan/dissectors/packet-umts_mac.h
-include/wireshark/epan/dissectors/packet-umts_rlc.h
-include/wireshark/epan/dissectors/packet-usb-hid.h
-include/wireshark/epan/dissectors/packet-usb.h
-include/wireshark/epan/dissectors/packet-usbip.h
-include/wireshark/epan/dissectors/packet-vxlan.h
-include/wireshark/epan/dissectors/packet-wap.h
-include/wireshark/epan/dissectors/packet-wccp.h
-include/wireshark/epan/dissectors/packet-windows-common.h
-include/wireshark/epan/dissectors/packet-wlancertextn.h
-include/wireshark/epan/dissectors/packet-wps.h
-include/wireshark/epan/dissectors/packet-wsp.h
-include/wireshark/epan/dissectors/packet-wtls.h
-include/wireshark/epan/dissectors/packet-wtp.h
-include/wireshark/epan/dissectors/packet-x11-keysymdef.h
-include/wireshark/epan/dissectors/packet-x11.h
-include/wireshark/epan/dissectors/packet-x2ap.h
-include/wireshark/epan/dissectors/packet-x509af.h
-include/wireshark/epan/dissectors/packet-x509ce.h
-include/wireshark/epan/dissectors/packet-x509if.h
-include/wireshark/epan/dissectors/packet-x509sat.h
-include/wireshark/epan/dissectors/packet-xml.h
-include/wireshark/epan/dissectors/packet-xmpp-conference.h
-include/wireshark/epan/dissectors/packet-xmpp-core.h
-include/wireshark/epan/dissectors/packet-xmpp-gtalk.h
-include/wireshark/epan/dissectors/packet-xmpp-jingle.h
-include/wireshark/epan/dissectors/packet-xmpp-other.h
-include/wireshark/epan/dissectors/packet-xmpp-utils.h
-include/wireshark/epan/dissectors/packet-xmpp.h
-include/wireshark/epan/dissectors/packet-xnap.h
-include/wireshark/epan/dissectors/packet-ypbind.h
-include/wireshark/epan/dissectors/packet-yppasswd.h
-include/wireshark/epan/dissectors/packet-ypserv.h
-include/wireshark/epan/dissectors/packet-ypxfr.h
-include/wireshark/epan/dissectors/packet-zbee-aps.h
-include/wireshark/epan/dissectors/packet-zbee-nwk.h
-include/wireshark/epan/dissectors/packet-zbee-security.h
-include/wireshark/epan/dissectors/packet-zbee-zcl.h
-include/wireshark/epan/dissectors/packet-zbee-zdp.h
-include/wireshark/epan/dissectors/packet-zbee.h
-include/wireshark/epan/dissectors/packet-ziop.h
-include/wireshark/epan/dtd.h
-include/wireshark/epan/dtd_parse.h
-include/wireshark/epan/dvb_chartbl.h
-include/wireshark/epan/eap.h
-include/wireshark/epan/eapol_keydes_types.h
-include/wireshark/epan/epan.h
-include/wireshark/epan/epan_dissect.h
-include/wireshark/epan/etypes.h
-include/wireshark/epan/ex-opt.h
-include/wireshark/epan/except.h
-include/wireshark/epan/exceptions.h
-include/wireshark/epan/expert.h
-include/wireshark/epan/export_object.h
-include/wireshark/epan/exported_pdu.h
-include/wireshark/epan/filter_expressions.h
-include/wireshark/epan/follow.h
-include/wireshark/epan/frame_data.h
-include/wireshark/epan/frame_data_sequence.h
-include/wireshark/epan/ftypes/ftypes.h
-include/wireshark/epan/funnel.h
-include/wireshark/epan/golay.h
-include/wireshark/epan/guid-utils.h
-include/wireshark/epan/iana_charsets.h
-include/wireshark/epan/iax2_codec_type.h
-include/wireshark/epan/in_cksum.h
-include/wireshark/epan/introspection.h
-include/wireshark/epan/ip_opts.h
-include/wireshark/epan/ipproto.h
-include/wireshark/epan/ipv4.h
-include/wireshark/epan/ipv6.h
-include/wireshark/epan/lapd_sapi.h
-include/wireshark/epan/llcsaps.h
-include/wireshark/epan/maxmind_db.h
-include/wireshark/epan/media_params.h
-include/wireshark/epan/next_tvb.h
-include/wireshark/epan/nlpid.h
-include/wireshark/epan/oids.h
-include/wireshark/epan/osi-utils.h
-include/wireshark/epan/oui.h
-include/wireshark/epan/packet.h
-include/wireshark/epan/packet_info.h
-include/wireshark/epan/params.h
-include/wireshark/epan/pci-ids.h
-include/wireshark/epan/plugin_if.h
-include/wireshark/epan/ppptypes.h
-include/wireshark/epan/prefs-int.h
-include/wireshark/epan/prefs.h
-include/wireshark/epan/print.h
-include/wireshark/epan/print_stream.h
-include/wireshark/epan/proto.h
-include/wireshark/epan/proto_data.h
-include/wireshark/epan/ps.h
-include/wireshark/epan/ptvcursor.h
-include/wireshark/epan/range.h
-include/wireshark/epan/reassemble.h
-include/wireshark/epan/reedsolomon.h
-include/wireshark/epan/register.h
-include/wireshark/epan/req_resp_hdrs.h
-include/wireshark/epan/rtd_table.h
-include/wireshark/epan/rtp_pt.h
-include/wireshark/epan/sctpppids.h
-include/wireshark/epan/secrets.h
-include/wireshark/epan/show_exception.h
-include/wireshark/epan/slow_protocol_subtypes.h
-include/wireshark/epan/sminmpec.h
-include/wireshark/epan/srt_table.h
-include/wireshark/epan/stat_groups.h
-include/wireshark/epan/stat_tap_ui.h
-include/wireshark/epan/stats_tree.h
-include/wireshark/epan/stats_tree_priv.h
-include/wireshark/epan/stream.h
-include/wireshark/epan/strutil.h
-include/wireshark/epan/t35.h
-include/wireshark/epan/tap-voip.h
-include/wireshark/epan/tap.h
-include/wireshark/epan/tfs.h
-include/wireshark/epan/timestamp.h
-include/wireshark/epan/timestats.h
-include/wireshark/epan/to_str.h
-include/wireshark/epan/tvbparse.h
-include/wireshark/epan/tvbuff-int.h
-include/wireshark/epan/tvbuff.h
-include/wireshark/epan/uat-int.h
-include/wireshark/epan/uat.h
-include/wireshark/epan/unit_strings.h
-include/wireshark/epan/value_string.h
-include/wireshark/epan/wmem_scopes.h
-include/wireshark/epan/wscbor.h
-include/wireshark/epan/x264_prt_id.h
-include/wireshark/epan/xdlc.h
-include/wireshark/file.h
-include/wireshark/wireshark.h
-include/wireshark/wiretap/file_wrappers.h
-include/wireshark/wiretap/merge.h
-include/wireshark/wiretap/pcap-encap.h
-include/wireshark/wiretap/pcapng_module.h
-include/wireshark/wiretap/secrets-types.h
-include/wireshark/wiretap/wtap.h
-include/wireshark/wiretap/wtap_modules.h
-include/wireshark/wiretap/wtap_opttypes.h
-include/wireshark/ws_attributes.h
-include/wireshark/ws_compiler_tests.h
-include/wireshark/ws_diag_control.h
-include/wireshark/ws_log_defs.h
-include/wireshark/ws_posix_compat.h
-include/wireshark/ws_symbol_export.h
-include/wireshark/ws_version.h
-include/wireshark/wsutil/802_11-utils.h
-include/wireshark/wsutil/adler32.h
-include/wireshark/wsutil/base32.h
-include/wireshark/wsutil/bits_count_ones.h
-include/wireshark/wsutil/bits_ctz.h
-include/wireshark/wsutil/bitswap.h
-include/wireshark/wsutil/buffer.h
-include/wireshark/wsutil/codecs.h
-include/wireshark/wsutil/color.h
-include/wireshark/wsutil/cpu_info.h
-include/wireshark/wsutil/crash_info.h
-include/wireshark/wsutil/crc10.h
-include/wireshark/wsutil/crc11.h
-include/wireshark/wsutil/crc16-plain.h
-include/wireshark/wsutil/crc16.h
-include/wireshark/wsutil/crc32.h
-include/wireshark/wsutil/crc5.h
-include/wireshark/wsutil/crc6.h
-include/wireshark/wsutil/crc7.h
-include/wireshark/wsutil/crc8.h
-include/wireshark/wsutil/curve25519.h
-include/wireshark/wsutil/eax.h
-include/wireshark/wsutil/epochs.h
-include/wireshark/wsutil/exported_pdu_tlvs.h
-include/wireshark/wsutil/feature_list.h
-include/wireshark/wsutil/filesystem.h
-include/wireshark/wsutil/g711.h
-include/wireshark/wsutil/glib-compat.h
-include/wireshark/wsutil/inet_addr.h
-include/wireshark/wsutil/inet_ipv4.h
-include/wireshark/wsutil/inet_ipv6.h
-include/wireshark/wsutil/interface.h
-include/wireshark/wsutil/jsmn.h
-include/wireshark/wsutil/json_dumper.h
-include/wireshark/wsutil/mpeg-audio.h
-include/wireshark/wsutil/netlink.h
-include/wireshark/wsutil/nstime.h
-include/wireshark/wsutil/os_version_info.h
-include/wireshark/wsutil/pint.h
-include/wireshark/wsutil/please_report_bug.h
-include/wireshark/wsutil/pow2.h
-include/wireshark/wsutil/privileges.h
-include/wireshark/wsutil/processes.h
-include/wireshark/wsutil/regex.h
-include/wireshark/wsutil/report_message.h
-include/wireshark/wsutil/sign_ext.h
-include/wireshark/wsutil/sober128.h
-include/wireshark/wsutil/socket.h
-include/wireshark/wsutil/str_util.h
-include/wireshark/wsutil/strnatcmp.h
-include/wireshark/wsutil/strtoi.h
-include/wireshark/wsutil/tempfile.h
-include/wireshark/wsutil/time_util.h
-include/wireshark/wsutil/to_str.h
-include/wireshark/wsutil/type_util.h
-include/wireshark/wsutil/unicode-utils.h
-include/wireshark/wsutil/utf8_entities.h
-include/wireshark/wsutil/wmem/wmem.h
-include/wireshark/wsutil/wmem/wmem_array.h
-include/wireshark/wsutil/wmem/wmem_core.h
-include/wireshark/wsutil/wmem/wmem_interval_tree.h
-include/wireshark/wsutil/wmem/wmem_list.h
-include/wireshark/wsutil/wmem/wmem_map.h
-include/wireshark/wsutil/wmem/wmem_miscutl.h
-include/wireshark/wsutil/wmem/wmem_multimap.h
-include/wireshark/wsutil/wmem/wmem_queue.h
-include/wireshark/wsutil/wmem/wmem_stack.h
-include/wireshark/wsutil/wmem/wmem_strbuf.h
-include/wireshark/wsutil/wmem/wmem_strutl.h
-include/wireshark/wsutil/wmem/wmem_tree.h
-include/wireshark/wsutil/wmem/wmem_user_cb.h
-include/wireshark/wsutil/ws_assert.h
-include/wireshark/wsutil/ws_cpuid.h
-include/wireshark/wsutil/ws_getopt.h
-include/wireshark/wsutil/ws_mempbrk.h
-include/wireshark/wsutil/ws_mempbrk_int.h
-include/wireshark/wsutil/ws_pipe.h
-include/wireshark/wsutil/ws_return.h
-include/wireshark/wsutil/ws_roundup.h
-include/wireshark/wsutil/wsgcrypt.h
-include/wireshark/wsutil/wsjson.h
-include/wireshark/wsutil/wslog.h
-include/wireshark/wsutil/xtea.h
 lib/libwireshark.so
-lib/libwireshark.so.16
-lib/libwireshark.so.16.0.10
+lib/libwireshark.so.17
+lib/libwireshark.so.17.0.0
 lib/libwiretap.so
-lib/libwiretap.so.13
-lib/libwiretap.so.13.0.10
+lib/libwiretap.so.14
+lib/libwiretap.so.14.0.0
 lib/libwsutil.so
-lib/libwsutil.so.14
-lib/libwsutil.so.14.0.0
-lib/pkgconfig/wireshark.pc
-lib/wireshark/cmake/FindGLIB2.cmake
-lib/wireshark/cmake/FindWSLibrary.cmake
-lib/wireshark/cmake/FindWSWinLibs.cmake
-lib/wireshark/cmake/LocatePythonModule.cmake
-lib/wireshark/cmake/UseAsn2Wrs.cmake
-lib/wireshark/cmake/UseMakePluginReg.cmake
-lib/wireshark/cmake/WiresharkConfig.cmake
-lib/wireshark/cmake/WiresharkConfigVersion.cmake
-lib/wireshark/cmake/WiresharkTargets-release.cmake
-lib/wireshark/cmake/WiresharkTargets.cmake
+lib/libwsutil.so.15
+lib/libwsutil.so.15.0.0
 lib/wireshark/extcap/androiddump
 lib/wireshark/extcap/ciscodump
 lib/wireshark/extcap/randpktdump
 lib/wireshark/extcap/sshdump
 lib/wireshark/extcap/udpdump
 lib/wireshark/extcap/wifidump
-lib/wireshark/plugins/4.0/codecs/g711.so
-${PLIST.spandsp}lib/wireshark/plugins/4.0/codecs/g722.so
-${PLIST.spandsp}lib/wireshark/plugins/4.0/codecs/g726.so
-lib/wireshark/plugins/4.0/codecs/l16mono.so
-lib/wireshark/plugins/4.0/codecs/opus_dec.so
-lib/wireshark/plugins/4.0/epan/ethercat.so
-lib/wireshark/plugins/4.0/epan/gryphon.so
-lib/wireshark/plugins/4.0/epan/irda.so
-lib/wireshark/plugins/4.0/epan/mate.so
-lib/wireshark/plugins/4.0/epan/opcua.so
-lib/wireshark/plugins/4.0/epan/profinet.so
-lib/wireshark/plugins/4.0/epan/stats_tree.so
-lib/wireshark/plugins/4.0/epan/transum.so
-lib/wireshark/plugins/4.0/epan/unistim.so
-lib/wireshark/plugins/4.0/epan/wimax.so
-lib/wireshark/plugins/4.0/epan/wimaxasncp.so
-lib/wireshark/plugins/4.0/epan/wimaxmacphy.so
-lib/wireshark/plugins/4.0/wiretap/usbdump.so
+lib/wireshark/plugins/4.2/codecs/amrnb.so
+lib/wireshark/plugins/4.2/codecs/g711.so
+${PLIST.spandsp}lib/wireshark/plugins/4.2/codecs/g722.so
+${PLIST.spandsp}lib/wireshark/plugins/4.2/codecs/g726.so
+${PLIST.ilbc}lib/wireshark/plugins/4.2/codecs/ilbc.so
+lib/wireshark/plugins/4.2/codecs/l16mono.so
+lib/wireshark/plugins/4.2/codecs/opus_dec.so
+lib/wireshark/plugins/4.2/epan/ethercat.so
+lib/wireshark/plugins/4.2/epan/gryphon.so
+lib/wireshark/plugins/4.2/epan/irda.so
+lib/wireshark/plugins/4.2/epan/mate.so
+lib/wireshark/plugins/4.2/epan/opcua.so
+lib/wireshark/plugins/4.2/epan/profinet.so
+lib/wireshark/plugins/4.2/epan/stats_tree.so
+lib/wireshark/plugins/4.2/epan/transum.so
+lib/wireshark/plugins/4.2/epan/unistim.so
+lib/wireshark/plugins/4.2/epan/wimax.so
+lib/wireshark/plugins/4.2/epan/wimaxasncp.so
+lib/wireshark/plugins/4.2/epan/wimaxmacphy.so
+lib/wireshark/plugins/4.2/wiretap/usbdump.so
 ${PLIST.icons}share/applications/org.wireshark.Wireshark.desktop
+share/doc/wireshark/COPYING
+share/doc/wireshark/README.xml-output
+share/doc/wireshark/pdml2html.xsl
+share/doc/wireshark/ws.css
 ${PLIST.icons}share/icons/hicolor/128x128/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png
 ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/org.wireshark.Wireshark-mimetype.png
@@ -714,15 +74,11 @@ ${PLIST.icons}share/icons/hicolor/48x48/
 ${PLIST.icons}share/icons/hicolor/64x64/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/64x64/mimetypes/application-vnd.tcpdump.pcap.png
 ${PLIST.icons}share/icons/hicolor/64x64/mimetypes/org.wireshark.Wireshark-mimetype.png
-${PLIST.icons}share/icons/hicolor/scalable/apps/org.wireshark.Wireshark.svg
 ${PLIST.icons}share/icons/hicolor/scalable/apps/wireshark.svg
 ${PLIST.icons}share/metainfo/org.wireshark.Wireshark.metainfo.xml
 ${PLIST.icons}share/mime/packages/org.wireshark.Wireshark.xml
-share/wireshark/Acknowledgements.md
-share/wireshark/COPYING
 share/wireshark/cfilters
 share/wireshark/colorfilters
-${PLIST.lua}share/wireshark/console.lua
 share/wireshark/dfilter_macros
 share/wireshark/dfilters
 share/wireshark/diameter/AlcatelLucent.xml
@@ -756,7 +112,6 @@ share/wireshark/diameter/mobileipv6.xml
 share/wireshark/diameter/nasreq.xml
 share/wireshark/diameter/sip.xml
 share/wireshark/diameter/sunping.xml
-${PLIST.lua}share/wireshark/dtd_gen.lua
 share/wireshark/dtds/dc.dtd
 share/wireshark/dtds/itunes.dtd
 share/wireshark/dtds/mscml.dtd
@@ -769,12 +124,7 @@ share/wireshark/dtds/smil.dtd
 share/wireshark/dtds/watcherinfo.dtd
 share/wireshark/dtds/xcap-caps.dtd
 share/wireshark/dtds/xcap-error.dtd
-share/wireshark/enterprises.tsv
-share/wireshark/gpl-2.0-standalone.html
-${PLIST.lua}share/wireshark/init.lua
 share/wireshark/ipmap.html
-share/wireshark/manuf
-share/wireshark/pdml2html.xsl
 share/wireshark/profiles/Bluetooth/colorfilters
 share/wireshark/profiles/Bluetooth/preferences
 share/wireshark/profiles/Classic/colorfilters
@@ -785,6 +135,7 @@ share/wireshark/radius/dictionary
 share/wireshark/radius/dictionary.3com
 share/wireshark/radius/dictionary.3gpp
 share/wireshark/radius/dictionary.3gpp2
+share/wireshark/radius/dictionary.5x9
 share/wireshark/radius/dictionary.acc
 share/wireshark/radius/dictionary.acme
 share/wireshark/radius/dictionary.actelis
@@ -988,10 +339,8 @@ share/wireshark/radius/dictionary.yubico
 share/wireshark/radius/dictionary.zeus
 share/wireshark/radius/dictionary.zte
 share/wireshark/radius/dictionary.zyxel
-share/wireshark/services
 share/wireshark/smi_modules
 share/wireshark/tpncp/tpncp.dat
 share/wireshark/wimaxasncp/dictionary.dtd
 share/wireshark/wimaxasncp/dictionary.xml
 share/wireshark/wka
-share/wireshark/ws.css

Index: pkgsrc/net/wireshark/distinfo
diff -u pkgsrc/net/wireshark/distinfo:1.168 pkgsrc/net/wireshark/distinfo:1.169
--- pkgsrc/net/wireshark/distinfo:1.168 Fri Oct  6 12:39:03 2023
+++ pkgsrc/net/wireshark/distinfo       Mon Nov 20 18:34:49 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.168 2023/10/06 12:39:03 adam Exp $
+$NetBSD: distinfo,v 1.169 2023/11/20 18:34:49 adam Exp $
 
-BLAKE2s (wireshark-4.0.10.tar.xz) = dee2ad1a0b7e9e54ccc4650adce957338a679703969e71fe2f42e545fb0ea40a
-SHA512 (wireshark-4.0.10.tar.xz) = 695a5617100195aad92ecc38a29c3b765018fee49913dd6025b2e19d1ec5c5c4ed4195a79b5caa9cf0e8476db237e74bb602e56e9d2989ae852298767eaffbe5
-Size (wireshark-4.0.10.tar.xz) = 43124192 bytes
-SHA1 (patch-CMakeLists.txt) = bfb0e748ce1f6577a758b650d1bed2b6d66dc026
+BLAKE2s (wireshark-4.2.0.tar.xz) = b34309d5d40794bf6e697cb2a96cd08742c594090d0f5a3ab61d64c9990dea44
+SHA512 (wireshark-4.2.0.tar.xz) = 6896da4a264c4163443c427869a1b9dc5e5b071f9e689ec8b93507a4f8e6780003c580ca60f42cad6ce68e9c26558794af29405e26970357d1b13a3db7cdbb62
+Size (wireshark-4.2.0.tar.xz) = 44941948 bytes
+SHA1 (patch-CMakeLists.txt) = 6c9e1dc7a7c7000a15ed49c24036b987f43156f2

Index: pkgsrc/net/wireshark/options.mk
diff -u pkgsrc/net/wireshark/options.mk:1.33 pkgsrc/net/wireshark/options.mk:1.34
--- pkgsrc/net/wireshark/options.mk:1.33        Fri Aug  4 05:26:59 2023
+++ pkgsrc/net/wireshark/options.mk     Mon Nov 20 18:34:49 2023
@@ -1,14 +1,14 @@
-# $NetBSD: options.mk,v 1.33 2023/08/04 05:26:59 adam Exp $
+# $NetBSD: options.mk,v 1.34 2023/11/20 18:34:49 adam Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.wireshark
-PKG_SUPPORTED_OPTIONS=         http2 lua spandsp
+PKG_SUPPORTED_OPTIONS=         http2 http3 ilbc lua spandsp
 PKG_OPTIONS_OPTIONAL_GROUPS=   gui
 PKG_OPTIONS_GROUP.gui=         qt5 qt6
-PKG_SUGGESTED_OPTIONS=         http2 lua qt6
+PKG_SUGGESTED_OPTIONS=         http2 http3 lua qt6
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           icons lua qt spandsp
+PLIST_VARS+=           icons ilbc qt spandsp
 
 .if !empty(PKG_OPTIONS:Mhttp2)
 .  include "../../www/nghttp2/buildlink3.mk"
@@ -16,16 +16,29 @@ PLIST_VARS+=                icons lua qt spandsp
 CMAKE_ARGS+=           -DENABLE_NGHTTP2=OFF
 .endif
 
+.if !empty(PKG_OPTIONS:Mhttp3)
+.  include "../../www/nghttp3/buildlink3.mk"
+.else
+CMAKE_ARGS+=           -DENABLE_NGHTTP3=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Milbc)
+.  include "../../audio/libilbc/buildlink3.mk"
+PLIST.ilbc=            yes
+.else
+CMAKE_ARGS+=           -DENABLE_ILBC=OFF
+.endif
+
 .if !empty(PKG_OPTIONS:Mlua)
 LUA_VERSIONS_ACCEPTED= 52 51
 .  include "../../lang/lua/buildlink3.mk"
-PLIST.lua=             yes
 .else
 CMAKE_ARGS+=           -DENABLE_LUA=OFF
 .endif
 
 .if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
 .  if !empty(PKG_OPTIONS:Mqt5)
+CMAKE_ARGS+=           -DUSE_qt6=OFF
 .    include "../../x11/qt5-qtsvg/buildlink3.mk"
 .    include "../../x11/qt5-qttools/buildlink3.mk"
 .    if ${OPSYS} == "Darwin"
@@ -34,7 +47,6 @@ CMAKE_ARGS+=          -DENABLE_LUA=OFF
 .      include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .    endif
 .  elif !empty(PKG_OPTIONS:Mqt6)
-GCC_REQD+=             9 # std::filesystem & version used by qt6
 CMAKE_ARGS+=           -DUSE_qt6=ON
 .    include "../../graphics/qt6-qtsvg/buildlink3.mk"
 .    include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
@@ -63,7 +75,7 @@ INSTALLATION_DIRS+=   share/icons/hicolor/
 
 .PHONY: install-icons
 install-icons:
-       ${INSTALL_DATA} ${WRKSRC}/resources/icons/wsicon.svg \
+       ${INSTALL_DATA} ${WRKSRC}/resources/historic/wsicon.svg \
                ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wireshark.svg
 .    for d in ${MIMEICON_SIZES}
        ${INSTALL_DATA} ${WRKSRC}/resources/icons/WiresharkDoc-${d}.png \

Index: pkgsrc/net/wireshark/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.8 pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.9
--- pkgsrc/net/wireshark/patches/patch-CMakeLists.txt:1.8       Tue Nov  1 08:59:25 2022
+++ pkgsrc/net/wireshark/patches/patch-CMakeLists.txt   Mon Nov 20 18:34:49 2023
@@ -1,39 +1,47 @@
-$NetBSD: patch-CMakeLists.txt,v 1.8 2022/11/01 08:59:25 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.9 2023/11/20 18:34:49 adam Exp $
 
 Do not make application bundle on Darwin.
 
 editcap needs -lm, like tfshark:
 editcap.c:(.text.startup+0x5b8): undefined reference to `modf'
 
---- CMakeLists.txt.orig        2022-10-26 17:36:47.000000000 +0000
+--- CMakeLists.txt.orig        2023-11-15 18:30:18.000000000 +0000
 +++ CMakeLists.txt
-@@ -1530,7 +1530,7 @@ else ()
-       set(EXTCAP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/extcap" CACHE INTERNAL "The extcap dir")
+@@ -1536,7 +1536,7 @@ if(WIN32)
+       set(WIN_WS2_32_LIBRARY   ws2_32.lib)
  endif()
  
 -if(APPLE)
 +if(APPLE AND ENABLE_APPLICATION_BUNDLE)
        #
+       # We assume that APPLE means macOS so that we have the macOS
+       # frameworks.
+@@ -1595,7 +1595,7 @@ else()
+ endif()
+ set(EXTCAP_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${EXTCAP_INSTALL_LIBDIR}")
+ 
+-if(APPLE)
++if(FALSE)
+       #
        # As https://developer.apple.com/library/archive/technotes/tn2206/_index.html
        # says,
-@@ -2599,7 +2599,11 @@ if(BUILD_wireshark AND QT_FOUND)
+@@ -2732,7 +2732,11 @@ if(BUILD_wireshark AND QT_FOUND)
                ${MINIZIP_LIBRARIES}
        )
  
--      add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
 +      if(ENABLE_APPLICATION_BUNDLE)
-+              add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
+       add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_WIRESHARK_BUNDLE_FILES})
 +      else()
-+              add_executable(wireshark WIN32 ${wireshark_FILES} ${EXTRA_BUNDLE_FILES})
++      add_executable(wireshark WIN32 ${wireshark_FILES} ${EXTRA_WIRESHARK_BUNDLE_FILES})
 +      endif()
-       if(WIN32)
+       if(MSVC)
                set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT wireshark)
        endif()
-@@ -3099,6 +3103,7 @@ endif()
+@@ -3231,6 +3235,7 @@ endif()
  
  if(BUILD_editcap)
        set(editcap_LIBS
 +              m
                ui
                wiretap
-               version_info
+               ${ZLIB_LIBRARIES}