Commit Graph

1378 Commits

Author SHA1 Message Date
João Valverde 0335ebdc3a dfilter: ftype_is_true -> ftype_is_zero 2022-03-23 11:04:41 +00:00
Gerald Combs e06864e777 Falco Bridge: Miscellaneous fixes.
Fix some issues found by the pre-commit script. Add a missing Debian
symbol. Update the README.
2022-03-22 17:51:32 +00:00
Dario Lombardo a3877af990
debian: add missing symbol. 2022-03-22 17:14:38 +01:00
Jaap Keuter bdb460ef69 Bluetooth: have BT specific global names contain bluetooth 2022-03-14 20:02:10 +00:00
Guy Harris 109b92b5d7 wiretap: have wtap_dump_close() provide a "needs to be reloaded" indication.
This allows the "needs to be reloaded" indication to be set in the close
process, as is the case for ERF; having a routine that returns the value
of that indication is not useful if it gets seet in the close process,
as the handle for the wtap_dumper is no longer valid after
wtap_dump_close() finishes.

We also get rid of wtap_dump_get_needs_reload(), as callers should get
that information via the added argument to wtap_dump_close().

Fixes #17989.
2022-03-14 19:12:20 +00:00
Dario Lombardo 3bfc864c72
debian: add missing symbol. 2022-03-11 08:28:12 +01: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 1b8d2bcf37 Debian: Update our symbols. 2022-03-05 16:05:09 -08:00
Gerald Combs 93d9b799b7 macOS: Fix our dSYM bundle name. 2022-03-05 15:49:01 -08:00
Gerald Combs 1677e0a8f9 Packaging: Ship macOS dSYMs in their own .dmg.
Create a Wireshark.dSYM bundle for our debugging symbols. Create a
separate .dmg for the dSYM bundle, similar to what we do for Windows.
`dwarfdump --uuid run/Wireshark.dSYM` returns what app

This reduces the size of the application bundle and .dmg quite a bit
(sizes measured with `du -sm`):

51	Wireshark 3.7.0 Intel 64.dmg
81	Wireshark dSYM 3.7.0 Intel 64.dmg
182	Wireshark.app
262	Wireshark.dSYM
2022-03-05 14:32:53 -08:00
John Thacker cbf76ea22f Export PDU: Allow native encapsulations / strip headers
Allow export PDU taps to be registered with a wiretap encapsulation
instead of always using WTAP_ENCAP_WIRESHARK_UPPER_PDU. This allows
creating normal capture files that aren't tied to wireshark without
having to do a "editcap -C -L -T", as well as creating files in
formats other than pcapng and pcap with tshark.

Provide a couple sample implementations in Ethernet (WTAP_ENCAP_ETHERNET)
and IP (v4 and v6, WTAP_ENCAP_RAW_IP) that are the most common use cases.
(I can imagine a few others; WTAP_ENCAP_MPEG_2_TS could probably be
useful, for example.) Fixes #15141
2022-02-25 20:29:16 -05:00
Michał Łabędzki d1e5ae8385 Bluetooth: make dissect_bluetooth_common() public API
It creates bluetooth_data_t what is The Center of the Bluetooth World in Wireshark,
most important is that bluetooth_data_t must provide shared trees (resources) to enable
dissection for non trivial relations in Bluetooth, for example mapping BDADDR to name.

Issue: 17570
Change-Id: Ice17b804ab6d4dcf0f77f1b2356a6712ce7e64b1
2022-02-25 02:13:18 +00:00
David Perry e2fab18853 wsutil: New API to gather compile/runtime info 2022-02-24 13:27:08 +00:00
Gerald Combs 0e427ac837 Packaging: Update our macOS notarization check.
It looks like altool changed its "info" argument from --eval-info to
--notarization-info at some point.
2022-02-22 18:36:35 -08:00
Gerald Combs 79da670bd1 Packaging+GitLab CI: Move debian to the packaging directory.
We keep our various packaging assets in the "packaging" directory. Move
the Debian assets there. dpkg-buildpackage doesn't seem appear to have a
"debian directory path" option, but symlinking worked in my test
container.
2022-02-13 13:21:58 -08:00
Gerald Combs 5f29a00814 NSIS: Completely remove the User's Guide.
The "Wireshark User's Guide" directory has two levels of directories
underneath it, so remove it recursively in the NSIS uninstaller.
Fixes #17898.
2022-01-23 19:26:47 -08: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
John Thacker 92c8c2f7a0 rpm: RHEL 8 update macros
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.)
2022-01-17 17:10:50 +00:00
John Thacker 65e3c4fbe2 rpm: expand comment
Be a bit more precise about what's wrong with bindir on SUSE
(when prefix is /usr/local or anything else.)
2022-01-17 08:01:46 -05:00
John Thacker 1d0fb38d38 rpm: Fix up paths
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.
2022-01-17 00:56:16 -05:00
John Thacker 800524131f rpm packaging: Add build requirements for the guides
The HTML guides require xsltproc and the docbook xsl stylesheets
in order to be generated.
2022-01-16 08:19:10 +00:00
Gerald Combs 816f858361 CMake+packaging: Updates for Visual Studio 2022
Update the NSIS and WiX CMakeLists for Visual Studio 2022.
2022-01-15 18:24:55 -08:00
John Thacker 736441ccfa packaging: Add RPM build dependencies for ninja, asciidoctor
If we're building with ninja, we need to require it.

While CentOS/RHEL/Rocky 8 doesn't have a asciidoctor package
(so we install it separately), we can add a BuildRequires on
the file that RubyGems creates for other rpm based distributions.
2022-01-08 00:00:52 +00:00
John Thacker 7027242c27 packaging: Let SUSE build with /usr prefix
There's a couple places where /usr/local is hardcoded in the
spec file that need to be replaced with %{_prefix} in order for
RPMs to build correctly on OpenSUSE with prefixes other than
/usr/local
2022-01-07 14:40:58 +00: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
John Thacker 858402d3c7 packaging: Fix RPM -qt subpackage requires
The BuildRequires and Requires for the -qt subpackage need to
go into its %package section, not its %description section.
The dependencies were not being enforced, but instead being added
to the description of the GUI package.
2022-01-06 04:33:00 +00:00
John Thacker 4b5d54f5ea packaging: Bump RPM glib2 version to 2.38
We require glib2 version 2.38 now, increase the version requirement
in the RPM spec file to match.
2022-01-05 10:21:23 -05:00
John Thacker 2cb8f34721 packaging: Remove unnecessary Requires
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
2022-01-05 09:53:17 -05:00
John Thacker 98378d76d0 packaging: ENABLE_RPATH_ORIGIN on Fedora RPM build
Fedora Linux recently turned on some hardcore RPATH hardening
that causes RPM build to fail with a wide variety of prefixes unless
$ORIGIN is enabled.

It builds fine with /usr as the prefix because in that case we disable
the RPATH.

In the long run perhaps we should have the rpm-package target use the
standard prefix of /usr instead of the CMAKE_INSTALL_PREFIX, but even
so we want the spec file to work if /usr/local is set as the prefix.
Fix #17830
2022-01-04 21:48:31 -05:00
John Thacker 007883408f packaging: Fix git-export-release.sh when CI_COMMIT_SHA undefined
Commit 0d820ddc8d added set -u to
the script, so the test for CI_COMMIT_SHA (added in commit
e7296d5208) needs to be changed
so there isn't a fatal error if it is unset.
2022-01-05 01:21:08 +00:00
João Valverde 119473eab3 CMake: Use more consistent naming for options
Having some options use DISABLE_ and others ENABLE_ is inconsistent
and difficult to remember. Use ENABLE_ instead consistently.

Frame-larger-than remains an exception.
2022-01-03 15:55:06 +00:00
Stig Bjørlykke d8474fdee7 Happy New Year 2022 2022-01-01 14:08:38 +01: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 b62197c283 CMake+GitLab CI: Reduce verbosity.
For various commands, make sure we show warnings and errors, but not
other extraneous information such as filenames.
2021-12-11 13:57:29 -08:00
Pascal Quantin cd752deeac Windows: upgrade Npcap to 1.60 2021-12-09 22:41:07 +01:00
João Valverde 7d6c7e4167 CMake: Try to fix WiX packaging 2021-12-06 09:12:56 +00:00
Gerald Combs 261d223a30 Packaging: Remove a macOS notarization wait.
Older versions of altool couldn't submit uploads concurrently. According
to

https://threadreaderapp.com/thread/1146464491288219653.html

that's no longer the case for version 4.0 and later. Remove our hacky
concurrency check.
2021-12-01 15:43:15 -08:00
Gerald Combs 54ef97cc01 Packaging: Specify host architectures in our macOS Extras packages.
Add 'hostArchitectures="arm64,x86_64"' to the ChmodBPF and path_helper
distribution XML files. "arm64" isn't specified in

https://developer.apple.com/library/archive/documentation/DeveloperTools/Reference/DistributionDefinitionRef/Chapters/Distribution_XML_Ref.html

but seems to be correct:

https://developer.apple.com/forums/thread/667672
https://stackoverflow.com/questions/11487596/making-macos-installer-packages-which-are-developer-id-ready

Blind attempt at fixing #17757.
2021-11-30 09:24:02 -08: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
Pascal Quantin 5c8969b5d7 Windows: add PCRE2 DLL to installers 2021-11-15 23:07:15 +01:00
Gerald Combs 64275ff196 macOS: Update some comments in osx-app.sh. 2021-11-15 09:26:20 -08:00
Gerald Combs e3159ae631 macOS: Add a workaround for libpcre2.
Work around an issue with libpcre2 similar to what we do for libsnappy
and libssh.
2021-11-14 17:06:38 -08: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
Gerald Combs 7f47511653 Try to fix RPM packaging.
Asciidoctor is now required for packaging. Try to make sure it's
installed on CentOS 8 and openSUSE 15.2. Note that CentOS 8 doesn't have
an Asciidoctor package, which complicates our SPEC.
2021-10-01 18:26:24 +00:00
Gerald Combs 84ab55cf75 Docs+Packaging: Convert our man pages to Asciidoctor.
Convert doc/*.pod to Asciidoctor. This:

* Means we use the same markup for our man pages, the guides, and
  release notes.
* Lets us add versions to our man pages.
* Gives us more formatting options, e.g. AsciiDoc supports `commands`,
  nested lists and makes it easy to include version information. The
  manpage backend doesn't seem to support tables very well,
  unfortunately.

Convert our CMake configuration to produce *roff and html man pages
using Asciidoctor. Add a "manarg" block macro which makes our synopses
wrap correctly.

Similar to the release notes, guides, and FAQ, if Asciidoctor isn't
found the man pages won't be generated or installed.

Move Asciidoctor to the list of package build dependencies in various
places.

This commit includes the conversion script (pod2adoc.py), which will be
removed later.

Line count sanity check:

Man page         .pod .adoc
androiddump       260  280
asn2deb            93  105
capinfos          401  471
captype            54   55
ciscodump         241  269
dftest             42   42
dpauxmon          153  169
dumpcap           464  534
editcap           528  583
etwdump           136  156
extcap            157  181
idl2deb            91  103
idl2wrs           120  100
mergecap          206  207
mmdbresolve        75   75
randpkt           107  111
randpktdump       158  184
rawshark          558  610
reordercap         76   78
sdjournal         145  157
sshdump           272  302
text2pcap         274  312
tshark           2135 2360
udpdump           133  151
wireshark-filter  486  479
wireshark        2967 3420
2021-10-01 16:42:34 +00:00
Pascal Quantin 530ee0b365 Windows: upgrade Npcap to 1.55 2021-09-07 23:18:19 +02: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