Commit Graph

130 Commits (9eeffdc5eb4495446e4869d3b31306a930c44af4)

Author SHA1 Message Date
João Valverde c66fc43e5b GUI: Ship authors as a Qt resource file 2023-01-20 13:35:03 +00:00
João Valverde 65e13f9d8f gitignore: Add Qt creator autosave 2022-07-28 14:29:12 +00:00
Gerald Combs 2ac2b0670a Git+CMake: Add support for CMake presets.
CMake 3.19 added support for CMakePresets.json and
CMakeUserPresets.json, which let you prepopulate various configure,
build, and test options. Add CMakeUserPresets.json to .gitignore as
recommended by the documentation and add an example to the Developer's
Guide. CMake uses 2-space indentation; specify that for CMake*.json in
2022-06-05 13:04:07 -07:00
Gerald Combs b4376b4533 Git+docs: Ignore and document CMakeListsCustom.txt. 2022-05-23 20:19:15 +00:00
Gerald Combs b5fef40379 Git: Fix our debian ignore.
We create a top-level symlink to packaging/debian in GitLab CI, so only
ignore that.
2022-04-08 19:24:18 +00: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
2022-02-13 13:21:58 -08:00
Roland Knall 00149f1454 Git: Ignore Visual Studio Code workspace definition 2022-02-05 12:34:14 +01:00
Gerald Combs 78984d855e Clean up .gitignore.
Remove entries that were generated by HTML Help and NMake or are
otherwise no longer relevant. Organize some other entries a little
2022-01-23 10:15:49 +00:00
Dirk Ziegelmeier 0efe56399c gitignore: Add ignores for clangd 2022-01-22 21:37:46 +00:00
Jeff Widman 330fd5733c Add /*build*/ to .gitignore
A common pattern is to build the source artifacts within a *build* dir.

For example, the wiki instructions for [building `wireshark` on `macOS` specify to
create a `./build`
mkdir build && cd build && cmake ../ && make

So this commit adds this directory to `.gitignore` to prevent
accidentally committing build artifacts.

The specific format `/*build*/` protects against the following:
1. The leading slash makes sure only top-level directories that match
this pattern are ignored.
2. The trailing slash makes sure that only directories (and not files)
are ignored.
3. The wildcards catch all the various variations on `build` folder name
that are used...
2020-09-27 21:36:15 +00:00
Gerald Combs 7e38df24c6 Remove some entries from .gitignore.
Remove "Wireshark.*", since that makes tools like ag and rg skip
packaging/wix/Wireshark.wxs. Add a note about this.

Remove other no-longer-relevant entries.

Change-Id: Ib3841249aef2018ca2ef0285a5d0ea799c54d310
Reviewed-by: Anders Broman <>
2020-02-25 12:37:19 +00:00
João Valverde cf12ef2748 gitignore: Remove leftover cruft.
Change-Id: Iac6d726533f9ea1d43287cd5a63f7dff47d27b2d
Reviewed-by: João Valverde <>
2019-09-20 22:24:11 +00:00
Peter Wu 5cc461490d CMake: use object libraries to avoid redundant builds
Some source files are duplicated via add_executable. Assuming that these
are not affected by target-specific preprocessor macros, they can be
built only once and shared among executables.

In one configuration, this reduces the number of object files by 55
(cli_main.c and version_info.c alone were built 15 times each).

Removes the version dependency from each target since the 'version_info'
target can now declare this dependency. Remove CLEAN_C_FILES from extcap
since it is not used to set -Werror. Due to removing some files from
wireshark_FILES (and others), these are no longer part of checkAPIs
though. Hopefully that is acceptable.

Change-Id: I0a3f1ffb950e70a6176c96d867f694fbc6476f58
Petri-Dish: Peter Wu <>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <>
Petri-Dish: João Valverde <>
Reviewed-by: Peter Wu <>
2019-01-12 18:20:44 +00:00
Émilio Gonzalez 2a59aca80d Add .idea/ and cmake-build-*/ to gitignore (for jetbrains IDEs)
Change-Id: I70d8203cfa0a0c14f4df65d3a4bc9d5a1fbf12ae
Reviewed-by: Peter Wu <>
2018-10-01 22:07:38 +00:00
Gerald Combs 29f7a5e9e0 .gitignore: Remove version.h.
Remove version.h from .gitignore. This appears to be a leftover artifact
from Autotools.

Change-Id: I7b278c36444673bd50d936585cfdc5562d9ea825
Petri-Dish: Alexis La Goutte <>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <>
2018-09-05 22:46:41 +00:00
Ralf Nasilowski 92872ee7ec Replaced "wireshark-win32-libs/" and "wireshark-win64-libs/" by "wireshark-win??-libs*/" in ".gitignore"
Change-Id: I154163847f54f2bce35ac5fa681d323290d6d7bf
Reviewed-by: Pascal Quantin <>
2018-08-16 06:26:10 +00:00
João Valverde 722d6b06f6 Rewrite make-{dissectors,taps} in Python
Having these build tools in machine code poses problems when cross-compiling.
The most significant being that we need to find the host and build GLiB
dependencies at compile-time.

There is no noticeable speed difference between the Python and C implementation.

Ping-Bug: 14622
Change-Id: Id13f823c7f4abf51edfa291e703028873748989f
Petri-Dish: Peter Wu <>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <>
2018-06-11 17:01:05 +00:00
João Valverde 64a2b4101a Move make-taps and make-dissectors to tools/
make-taps and make dissectors are build tools so that is the natural
location for them.

See also 99ec2b58eb68ab8530245dd13485612695ba064a and bug 14622.

Change-Id: I754848ea1c614bfa7121c44d89136ac3cba8a734
Petri-Dish: João Valverde <>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <>
2018-05-31 13:35:27 +00:00
Gerald Combs 93adeae1a8 Remove some unused .gitignore entries.
Remove unused documentation extensions (.dbk or .fo) and what appear to
be files generated or used by QMake.

Change-Id: I8635436e6e7e7117ef9d0aadf97f925751d8df18
Reviewed-by: Anders Broman <>
2018-05-25 04:18:08 +00:00
Dario Lombardo 9a30bad6b6 gitignore: add test log files.
They are generated by 'test' target and should be ignored.

Change-Id: Ie378c356ba586e826946abfcfcd8faf2c3ad3c2d
Reviewed-by: Dario Lombardo <>
2018-05-10 08:18:27 +00:00
Dario Lombardo 4a156da068 Remove autotools build system.
It has been replaced by cmake.

Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a
Petri-Dish: Dario Lombardo <>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <>
Reviewed-by: Anders Broman <>
2018-04-18 03:46:17 +00:00
Gerald Combs b56e437160 More GTK+ removal.
Remove GTK+ entries from .gitignore and start removing it from

Change-Id: I70391000906e983eab250c8158b486c3dc6d4a16
Reviewed-by: Gerald Combs <>
2018-04-17 17:09:51 +00:00
Gerald Combs ad84eec866 Switch the Doxygen API reference build to CMake.
Switch to a single Doyxgen configuration which was generated using a
recent version of Doxygen and customized to suit our needs. Add
wsar_html and wsar_html_zip targets to CMake. Update some Doxygen markup
and documentation as needed.

Change-Id: Ic8a424b292c35a26f74ae0b53322265683e56e69
Reviewed-by: Gerald Combs <>
Petri-Dish: Gerald Combs <>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <>
2018-04-17 03:46:05 +00:00
Peter Wu 82e8aa33a7 document parallelization support
Tests are independent and can be run in parallel using pytest-xdist
(, document it.

While at it, allow running the tests from other directories.

Change-Id: I3e55c549669f7d59d35cd64eca53680cea6dec2d
Reviewed-by: Peter Wu <>
Petri-Dish: Peter Wu <>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <>
2018-04-15 05:34:41 +00:00
Guy Harris 6178d2a120 mmdbresolve is an executable; git should ignore it.
Change-Id: I025c7c482182fdfa0849306f50d118d389670c83
Reviewed-by: Guy Harris <>
2018-03-26 02:53:57 +00:00
Jaap Keuter 2f759ce7a7 Update paths after dissector plugin move.
With the change in paths of the dissector plugins in the repository some
other paths require adjustment. These are the obvious changes remaining.

Change-Id: Id49ac6aaf1a29d9eb37f4c32226a4597d5e32edd
Signed-off-by: Jaap Keuter <>
Reviewed-by: João Valverde <>
Reviewed-by: Gerald Combs <>
2018-01-16 19:02:28 +00:00
Peter Wu f8b67cb931 Rename and fix CMake on removals
"" is an input file for "make-dissectors" which outputs
"dissectors.c", but does not contain C code. Rename it to
"" instead.

When a dissector is removed from the list, the dissectors.c file was not
properly generated even if CMake was re-run. Fix this by adding an
additional dependency on the input file. autotools likely suffers from
the same problem with removed files, I have not tried to fix that.

Restore's João's original approach using file(GENERATE) to avoid using
configure_file, this requires CMake 2.8.12.

Change-Id: Id07cd8ef502186a90d41b3bb77ed0d9c94845af9
Fixes: v2.5.0rc0-1763-gfe0c2b0485 ("Rewrite in C")
Petri-Dish: Peter Wu <>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <>
Reviewed-by: Peter Wu <>
2017-12-24 13:30:06 +00:00
Roland Knall 9401571a24 Qt: Add QtCreator generated files to gitignore
Change-Id: Id3ba4eede12de954bdc34d906abf2a84dc3e1cdd
Reviewed-by: Roland Knall <>
2017-12-14 10:26:14 +00:00
João Valverde 5fc43fe63a Rewrite in C
Change-Id: Ief5b1fffecc9712c01ff10292c403b7c84a5908a
Reviewed-by: João Valverde <>
2017-12-11 02:52:28 +00:00
Jakub Zawadzki 038aa2a616 Add fuzzshark to cmake/autotools.
Add fuzzshark target to make sure that oss-fuzzshark always build.

Change-Id: I802b679c18023daa1475a54bae722b5e90c72a59
Petri-Dish: Jakub Zawadzki <>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <>
2017-12-07 23:26:52 +00:00
João Valverde 986a084de3 Update .gitignore
Change-Id: I3b5f343f241a7d0571ddd7a0647c45c2bef28c73
Reviewed-by: João Valverde <>
2017-11-29 15:42:04 +00:00
Stig Bjørlykke 87a8877007 gitignore: Add packaging/macosx/PkgInfo
Change-Id: I630fa8ae0c3d5f078922b4d6cb2ee064c31bd35e
Reviewed-by: Stig Bjørlykke <>
2017-11-28 13:01:31 +00:00
João Valverde fe0c2b0485 Rewrite in C
The output compares equal to and the regex
should be more robust (multiline, complete start of function definition).

The primary motivation is to clean up the python script. This small
binary results in much cleaner code. The python script is used only
to generate plugin code, therefore it is renamed.

Also in my casual measurements the C code is much faster (without cache)
than the python script with the cache.

Change-Id: Id4e8cac3c836d56775aba4819357a95ef19bcb85
Petri-Dish: Anders Broman <>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <>
2017-11-20 06:03:08 +00:00
João Valverde 7d4e087070 Update .gitignore
Change-Id: Ia066511bc27618ee8e0a55e046a6d9437a4c3175
Reviewed-by: João Valverde <>
2017-11-18 15:05:45 +00:00
João Valverde 1d238ec636 autotools: Remove
It seems to be some sort of development helper, and since CMake doesn't
use it presumably it is not useful anymore.

Change-Id: I23e4ab24199f21310ebd09064c3ae53e48673e4d
Petri-Dish: Gerald Combs <>
Petri-Dish: João Valverde <>
Reviewed-by: João Valverde <>
2017-10-17 18:48:46 +00:00
Gerald Combs 4d563d8f10 Remove the SVR4 packaging assets.
Remove the svr4-package and solaris-package targets along with their
associated files and directories. We used to use this to build Solaris
packages but we haven't shipped those in years. Given that the last
substantive change to packaging/svr4 was in 2008 it's likely that this
has been unused for a while.

Change-Id: Ib9153c99f503200ea8c48d3ef81ad688ee55c09f
Petri-Dish: Gerald Combs <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Anders Broman <>
2017-10-02 04:11:28 +00:00
João Valverde a269ae1b6a Rename "ws_version_info.h", also .c
It's not installed so like most other files it doesn't need or benefit
from the prefix.

Change-Id: I01517e06f12b3101fee21b68cba3bc6842bbef5c
Petri-Dish: João Valverde <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: João Valverde <>
2017-09-26 17:32:08 +00:00
Alexis La Goutte 421085cc4c .gitignore: move ui/qt/gitignore to root gitignore
Change-Id: I303c6998b7b825ebb89aa1a81296b1ad69786ec1
Reviewed-by: Alexis La Goutte <>
Reviewed-by: Dario Lombardo <>
2017-07-20 22:39:56 +00:00
Alexis La Goutte dc9adf904b .gitignore: Add ignore to moc file on new qt subfolder

and for new folder

Change-Id: If1ed71b844164fdf7a438d47244a0ad0e18b432b
Reviewed-by: Alexis La Goutte <>
Reviewed-by: Roland Knall <>
2017-07-17 14:29:42 +00:00
Guy Harris 659d07f1e6 Ignore .moc.cpp files in ui/qt/widgets.
Change-Id: Ie709b9a13f1f2a76b355ffebeadbed0e47d90d2a
Reviewed-by: Guy Harris <>
2017-07-16 05:42:58 +00:00
Joerg Mayer 0b6b152694 Remove echld/.
It has been unsupported for some years and when talking about removing it
in the past I received some positive and no negative feedback.

There is one instance of echld left:
capchild/capture_sync.c:                 * echld might have already reaped the child.

Can that case be removed or should be comment be updated to something more
accurate? (left for a separate patch)

Change-Id: Idac397158dd86fd0728eb95379449ee4a463fc28
Petri-Dish: Jörg Mayer <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Anders Broman <>
2017-03-19 15:13:14 +00:00
Guy Harris 5fbcfd632a Clean up some UN*X-vs-Windows socket issues.
Have a wsutil/socket.h file, for inclusion by everything that uses
sockets, that contains the UN*X-vs-Windows #includes and #defines to
hide some UN*X-sockets vs. Winsock API differences.  That stuff mostly
comes from from extcap/extcap-base.h; have that file just include
wsutil/socket.h rather than defining that stuff itself.

Include it in sharkd_daemon.c.  Use socklen_t for the size of things to
pass to bind() as the last argument; wsutil/socket.h defines it as int
on Windows.

Ignore sharkd in Git.

Change-Id: I3f2171b7aa613717f52305f62bfd7d43e0172dc6
Petri-Dish: Guy Harris <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Guy Harris <>
2017-01-26 07:00:06 +00:00
Dario Lombardo 47650d357e extcap: add udpdump.
Udpdump is a generic UDP receiver that exports datagram in PCAP format.

Change-Id: I52620a92b12530b6f9b5449c43e692663acdfc14
Reviewed-by: Alexis La Goutte <>
Petri-Dish: Alexis La Goutte <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Roland Knall <>
2016-09-16 08:07:30 +00:00
João Valverde 21f5c53ae7 Rename PIDL Makefile
Otherwise it will get overwritten by the in-tree cmake build.

Issue reported by Rémy Léone.

Change-Id: I0d908973386bcb70585f5e32c36456230967bb7f
Petri-Dish: Michael Mann <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Michael Mann <>
2016-07-05 21:58:03 +00:00
João Valverde 5c03bda31a Qt: Generate .qm files during build
Change-Id: Ia2ee723227e1b331eeec0f0463654f35a4c9f37b
Petri-Dish: Martin Kaiser <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Martin Kaiser <>
2016-06-28 20:53:17 +00:00
Peter Wu 4add8b6b45 cmake: add idl2wrs-dissectors target for DCERPC
Add a callable target such that dissectors can be generated without the
AUTOGEN_dcerpc option.

Modelled after the pidl CMakeLists.txt file and target. This approach
has the advantage over the previous implementation such that the clean
target does not remove the packet-dcerpc-X.c files.

Change-Id: I3226937eaa76dffa253df9d4f989421d5faa3f3f
Petri-Dish: Peter Wu <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Peter Wu <>
2016-06-27 21:08:45 +00:00
Peter Wu deef1dc1ff cmake: add PIDL dissector generation support
The dissectors list is generated based on regex magic on pidl/Makefile.
A dssetup.cnf file is added because all other protocols already have
this file. The srvsvc and wkssvc protocols cannot be built for some
reason, so just disable it (this mirrors the original Makefile).

Add frsrpc and samr to PIDL_DISSECTOR_SRC list which was missing
compared to autotools.

Tested with an out-of-tree and in-tree build with cmake (make and ninja):

    cmake -GNinja && ninja -v pidl-dissectors
    touch epan/dissectors/pidl/dfs/dfs.idl && ninja generate_dissector-dcerpc-dfs
    cmake . && make -C epan/dissectors/pidl generate_dissector-dcerpc-dfs

Change-Id: Id8bf34e76c20053a8a393024560d90a048473e03
Petri-Dish: Peter Wu <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Anders Broman <>
2016-06-19 02:28:53 +00:00
Peter Wu 44e3212bce gitignore: updated cmake paths
* files.txt: v2.1.0rc0-2918-g2e23b50 ("Add checkAPI calls to CMake.")
* epan: v2.1.0rc0-2202-g6b54fbf ("CMake: Add more structure to
  libwireshark build")
* asn1: v2.1.0rc0-2330-g54a520d ("Move /asn1 to /epan/dissectors")

Change-Id: I0ef590de7d262d96c011be360b958fbda72a61fa
Reviewed-by: Peter Wu <>
2016-06-16 05:29:19 +00:00
Pascal Quantin 6baa1b544c Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Petri-Dish: Pascal Quantin <>
Tested-by: Petri Dish Buildbot <>
Reviewed-by: Jörg Mayer <>
Reviewed-by: Balint Reczey <>
2016-06-15 19:21:57 +00:00
Gerald Combs f54ef6f8a0 Git: Add .vscode to .gitignore.
Change-Id: Ib4bb2d03eb493f83e18c507b1675feefd1f27384
Reviewed-by: Gerald Combs <>
2016-05-05 17:46:58 +00:00