Commit Graph

409 Commits

Author SHA1 Message Date
João Valverde b8ec3199ab Convert Acknowledgements to markdown and update GUI
Move Acknowledgements to a separate file to enable some code
simplification and improve maintenance and discoverability
for acknowlegements.

Convert the Acknowledgements file to Github flavored markdown
and display it in rich text using QTextBrowser.

Add Acknowledgements.md to NSIS installer
2022-08-02 00:09:29 +00:00
João Valverde ab77d11599 Windows: Add missing license file to installer 2022-07-27 22:27:50 +00:00
Alexis La Goutte ca178cf03a NSIS(wireshark): Remove QUICK LAUNCH
It is not longer (really) supported with Windows 10, now it is pinned Taskbar
2022-07-17 19:55:33 +00:00
Gerald Combs 5d61db3ad5 CMake+NSIS: More variable cleanup. 2022-06-07 18:24:59 -07:00
Gerald Combs 8c7e3f0d30 Packaging: Add a Logwolf NSIS config.
Create Logwolf-specific copies of the various Wireshark NSIS config files
and modify them to install and uninstall Logwolf. There are still a bunch
of rough edges, but the installer works for a test capture I have here.
2022-06-03 21:24:21 +00:00
Gerald Combs 06f0b78ce6 NSIS: Deprecate 32-bit installs.
Recommend 3.6 or earlier for 32-bit users.
2022-06-03 10:26:19 -07:00
Gerald Combs 9e7a2b7699 NSIS: Fix our indentation.
The NSIS project uses 2-space indentation. Make sure we conform to that.
2022-06-03 10:26:14 -07:00
Gerald Combs 056fd8a1e3 NSIS: Update some target and filenames.
Rename the following build targets, similar to the recent macOS target
name changes:

nsis_package_prep to wireshark_nsis_prep
nsis_package to wireshark_nsis

Rename some NSIS files to reflect that they're specific to Wireshark.
Update the documentation and CI configurations.
2022-06-02 16:33:31 -07:00
Chuck Craft 0c316ec1a9 NSIS/Wix: missing preferences file for Bluetooth profile 2022-04-07 22:09:02 +00:00
Adrian Granados 8622c92a75 extcap: new interface, wifidump, to capture Wi-Fi frames using a remote SSH host 2022-03-09 08:01:39 +00:00
Gerald Combs f405771abb Packaging: Fix some paths. 2022-03-08 19:36:20 -08:00
Gerald Combs e482b375f2 Rename the "image" directory to "resources".
The "image" directory contains resource compiler assets and other
application resources, so name it "resources."
2022-03-09 02:07:51 +00:00
Gerald Combs 91463dde4d NSIS: Use the correct Visual C++ Redistributable file name.
Make sure the file we attempt to execute is the one we include with
our installer. Fixes #17893.
2022-01-18 18:25:26 -08:00
Gerald Combs c65f0a5a15 Update our Npcap URLs.
The official Npcap web site is now https://npcap.com/. Update our URLs
to match. Fixes #17838.
2022-01-06 16:12:30 -08:00
Gerald Combs 797c66cc4c NSIS: Complain about installing a 32-bit Wireshark on 64-bit Windows.
Show a warning messagebox if we're installing a 32-bit executable on
64-bit Windows.
2021-12-29 23:30:55 +00:00
Gerald Combs 5e345d390b NSIS: Remove some confusing error message text.
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.
2021-11-28 21:31:35 +00:00
Martin Mathieson 54ac7b4424 Fix some spelling errors 2021-10-20 10:00:12 +01:00
Gerald Combs 2236009e21 Packaging: Add captype to the Windows installers.
Add captype and its documentation to the NSIS and WiX packages.
2021-10-13 17:54:02 +00:00
Chuck Craft eb83421c96 NSIS: expand title area for long program names that wrap
Release candidates (rc blah blah hash) or if WIRESHARK_VERSION_EXTRA
is set for the build, are wrapped/clipped to be unreadable.
2021-09-04 06:19:42 +00:00
Gerald Combs 6bfab69d14 Windows: Switch from HTML Help to plain HTML.
Switch from HTML Help to plain HTML files. In the NSIS and WiX installers,
place the help assets in a directory with a friendly name.
2021-06-04 08:57:32 +00:00
Anders Broman 9456a85022 NSIS: install all files in the protobuff directory. 2021-05-21 10:38:54 +02:00
Graham Bloice f6ad4812a2 Add SparkplugB dissector
Add a dissector for SparkplugB as a heuristic subdissector of MQTT
and which calls protobuf to dissect the messages payload.
2021-05-14 12:11:03 +01:00
Odysseus Yang 2a5b34d8b0 MBIM: Update dissector to support DLT_ETW
New link type DLT_ETW is added for write and read Event Trace on Windows.
This change updates MBIM dissector to decode a MBIM message from
a DLT_ETW packet.
2020-12-02 09:05:11 +00:00
Lin Sun 6136c719da RTP: opus playback
It's possible to play opus payload with libopus (https://opus-codec.org/).
Closes #16882.

Helped-by: Pascal Quantin <pascal.quantin@gmail.com>
Signed-off-by: Lin Sun <lin.sun@zoom.us>
Signed-off-by: Yuanzhi Li <ryanlee@mail.ustc.edu.cn>
2020-10-03 21:15:09 +00:00
Ben Bass 73c0e8efc9 Add Metaswitch vendor-specific AVPs for Diameter 2020-09-28 14:30:22 +00:00
Pascal Quantin 6ee65f8af9 Radius: include newly added dictionary files
Follow-up of g9fc4ac6cae

Change-Id: I7c7fb388d4aac0f126a20d20230f837985a2846f
Reviewed-on: https://code.wireshark.org/review/38143
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-08-13 05:32:16 +00:00
Chuck Craft 93012800c8 Extcap: silent mode install
Extcap binaries are not part of default install.
Normal (graphical) allows them to be selected for installation.
Add flags to allow install when doing command line (silent) install.

Ping-Bug: 16562
Change-Id: I6ce0fa3b46f9820dc7f66945cda963a3f629579b
Reviewed-on: https://code.wireshark.org/review/37185
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-07-15 20:36:35 +00:00
Peter Wu 677fc33d5c NSIS: remove unused DisableSection and EnableSection macros
These macros were added in commit 6e9e773a85 for GTK1-related stuff
and removed in commit 12ac5d6859 and serve no other purpose. Note that
documentation for section flags can be found in
https://nsis.sourceforge.io/Docs/Chapter4.html#sectionsetflags

Change-Id: I6a24de8836e40e94c9a55706bdce6a64e1adb553
Reviewed-on: https://code.wireshark.org/review/37309
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-05-26 08:31:52 +00:00
Jirka Novak 12a13a6926 RTP: decode iLBC payload
It is possible to decode iLBC payload. It uses libilbc library (https://github.com/TimothyGu/libilbc).

Bug: 16314
Change-Id: Id4cad7ae32305a0e94ef32beb24e07733d7f834e
Reviewed-on: https://code.wireshark.org/review/35686
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-01-20 07:50:08 +00:00
Gerald Combs f9c2b3aa79 NSIS: Fix a dangling output path.
The updates to windeployqt-to-nsis.ps1 g7a09c78f12 added SetOutPath
calls to qt-dll-manifest.nsh. This means we need to reset the output
path before adding our translation files.

Change-Id: I4b4ede72efa67cc4617aaae5baf8d38df6952df7
Reviewed-on: https://code.wireshark.org/review/35705
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2020-01-09 00:35:53 +00:00
Gerald Combs 200124d420 NSIS: Make the licensing page match reality.
The NSIS licensing page is centered around making the user agree to
a EULA. We don't have one of those. Replace the "you must accept" and
"I agree" text with something more neutral.

We could alternatively omit with the licensing page altogether, but
the GPL is an important aspect of the project and deserves some sort
of mention.

Bug: 1115
Change-Id: I5fd5beac2188b61a90c2842de7d7547aa815ff4f
Reviewed-on: https://code.wireshark.org/review/35624
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-01-08 04:55:50 +00:00
Gerald Combs 63945535ac NSIS: The "Sshdump" option installs Ciscodump as well.
Use consistent capitalization while we're here.

Change-Id: I0591654b0e73d33528f9cfe990a1491ce6cccc8b
Reviewed-on: https://code.wireshark.org/review/35278
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-12-02 01:30:32 +00:00
Gerald Combs 11be78a61f NSIS: Don't run Wireshark from the installer.
Remove the option to run Wireshark from the NSIS installer. As noted in
bug 16195, this runs Wireshark as Administrator which is something we
recommend against.

Bug: 16195
Change-Id: I0692262a611d72d9e9f9c2131ce71cc62b4737b1
Reviewed-on: https://code.wireshark.org/review/35143
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-11-20 04:39:53 +00:00
Pascal Quantin 99effcada2 Windows: upgrade Npcap to 0.9984
While we are at it, let's deactivate by default the legacy loopback adapter installation

Change-Id: I4950e9dc6de8a2faeda272c03165a9f305862f6b
Reviewed-on: https://code.wireshark.org/review/35004
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-11-06 16:37:57 +00:00
João Valverde 97cb389a35 Revert "CMake: Don't install HTML manuals twice"
This reverts commit f1285fcf06.

NSIS package is broken with this commit.

Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6
Reviewed-on: https://code.wireshark.org/review/34758
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2019-10-10 15:58:41 +00:00
João Valverde f1285fcf06 CMake: Don't install HTML manuals twice
HTML docs are installed to both $docdir and $pkgdatadir. Fix that
to install to $docdir only.

Change-Id: I115158585b6df9170d9a01249adbc8548df91f14
Reviewed-on: https://code.wireshark.org/review/34640
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
2019-10-09 13:24:58 +00:00
Marcus Sundberg 1f01322dc0 Add RADIUS dictionary for Aptilo Access Controllers
Change-Id: I058aacf1bdb2a6151ad370ed09febe79b1886701
Reviewed-on: https://code.wireshark.org/review/34594
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-09-23 14:53:38 +00:00
Peter Wu a537edfdff Diameter: Add MS-CHAP/MS-CHAPv2 AVP support for EAP-TLS
Created the Microsoft Diameter file based on MS-CHAP-* AVPs listed at
https://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml#eap-numbers-10
Many values are displayed as bytes for simplicit. The MS-CHAP2-Success
attribute could for example be dissected further as 1 byte followed by a
string, but that requires more effort.

Allow padding to be missing since the eap-ttls-mschapv2.pcapng capture
would throw a Malformed Packet exception otherwise.

Bug: 15603
Change-Id: I9efc322a86802e78bb6cd4bc3df1c1282a45fe9e
Reviewed-on: https://code.wireshark.org/review/34291
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-15 04:10:16 +00:00
Guy Harris 5cf3fd03f1 HTTPS In More Places, update some URLs.
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8
Reviewed-on: https://code.wireshark.org/review/34096
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-27 07:55:36 +00:00
Pascal Quantin 8a1a63d7c9 Windows: package codec plugins
Change-Id: Id0e43d0272cb62e171e74b5cf957fadfe0bd7a24
Reviewed-on: https://code.wireshark.org/review/33562
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11 22:06:19 +00:00
João Valverde 63af1da7e7 Kill libwscodecs plugin library, just use plugins
Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5
Reviewed-on: https://code.wireshark.org/review/33068
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11 20:59:39 +00:00
akuchekar bcfe022d22 New Diameter AVPS
Change-Id: Ic7fca037cdf041988bc93f6b4066eb190e3028d0
Reviewed-on: https://code.wireshark.org/review/33461
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-08 14:32:28 +00:00
Ethan Everett 4591286d3a radius: add Meraki dictionary
Change-Id: Ibba2254bd9711b9cbac2d8f3ef2e209ccdc45bc0
Reviewed-on: https://code.wireshark.org/review/32621
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-04-10 21:11:00 +00:00
Gerald Combs a6da14982b NSIS: Fix our extra installer location.
We know the native Windows library path early on in the configure
process. Use it to set the location of the Npcap and USBPcap installers
instead of trying to derive it from the GLib DLL path.

Change-Id: I02d48e115b374fb6080a7fe8017cba789254d5f1
Reviewed-on: https://code.wireshark.org/review/32475
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-03-18 23:47:38 +00:00
Peter Wu ba1ef0ec3d Re-implement "Map" feature for Endpoints
This feature was removed in v2.5.1rc0-427-gf529ab5d0a, anticipating that
MaxMind would remove support for it in 2019. They have however changed
their mind and maintained latitude and longitude information.

They recommend displaying an accuracy radius, but the reported values
are 50, 100, 200 and 1000km. When implemented literally, a marker in
Ireland would cover the whole island plus mainland, so I have instead
opted to use a fixed radius of 1km at deeper zoom levels.

The old ipmap.html file was outdated and had broken tiles, I rewrote a
new one from scratch using the light-weight Leaflet library combined
with tiles from OpenStreetMap. This is more mobile-friendly and secure
(https, SRI). To improve handling of nearby or overlapping nodes,
clustering is used (individual nodes can still be inspected).

Browser compatibility results: IE8 is unusable, IE9 partially works
(tooltips sometimes disappear and the cluster radius control is gone),
IE11 works. Of course Firefox 65 and Chromium 72 have no issues.

The map popup description in the generated GeoJSON structure is now
split in several properties, allowing presentation to be handled by the
HTML page instead of the C code.

Bug: 14693
Change-Id: If2ec9c518f7723ac0ab27b6272463356875a0ff2
Reviewed-on: https://code.wireshark.org/review/31952
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-02-16 21:11:12 +00:00
Gerald Combs 4bcad12279 NSIS: Add ERROR_PRODUCT_VERSION to the vcredist checks.
If the Visual C++ Redistributable installer returns 1638
(ERROR_PRODUCT_VERSION) treat it as a success.

Bug: 15509
Change-Id: I136704ddc3266abc1a79f0fdcdd0b6cb7e33266e
Reviewed-on: https://code.wireshark.org/review/32041
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-02-15 05:15:55 +00:00
Gerald Combs 35dde308c4 NSIS: Fix packaging.
Remove leftover help entries.

Change-Id: I6c1402ecffda1196a12e4165b91b21d15c4380ca
Reviewed-on: https://code.wireshark.org/review/32038
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-15 00:09:37 +00:00
Gerald Combs 23c9a1e036 Convert the FAQ to Asciidoctor and remove old help files.
Convert our self-generating FAQ to Asciidoctor via the following steps:

- `help/faq.py > /tmp/faq.html`.
- `pandoc -t asciidoc -o docbook/faq.adoc /tmp/faq.html`.
- Manually clean up the markup using a text editor.

Question and answer content was left intact. Removing or updating
obsolete content will have to be done in a separate change.

The Asciidoctor project uses the .adoc extension, so start using it here
as well.

The contents of the "help" directory appear to have been used for
offline support in help_url.c, but that functionality was removed in
2008 in 242e3b78bc. Its content is covered in the User's Guide and man
pages so remove it.

Change-Id: I9060eefe97cfc137f8b414077c30f814379b576a
Reviewed-on: https://code.wireshark.org/review/32014
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-02-14 23:11:15 +00:00
Pascal Quantin 7753ce58ea Windows: uncheck WinPcap API-compatible mode in Npcap installer
Uninstalling WinPcap through recent Npcap installers seem to fail
for some users. For now install Npcap native mode instead.

Bug: 15476
Change-Id: I9114eb824fb1bd99d5da82e8bff87f7b7eb49a74
Reviewed-on: https://code.wireshark.org/review/31870
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-02-06 09:32:20 +00:00
Guy Harris 7bb2c2e6bc Fix copy-and-pasteo.
Change-Id: Ib31602f79203a6bd3313b55ea9d83cf56933c171
Reviewed-on: https://code.wireshark.org/review/31514
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-12 18:32:17 +00:00