Merge the caputils/ and capchild/ directories

The distinction between the different kinds of capture utility
may not warrant a special subfolfer for each, and sometimes the
distinction is not be clear or some functions could stradle
multiple "categories" (like capture_ifinfo.[ch]).

Simplify by having only a generic 'capture' subfolder. The
separate CMake libraries are kept as a way to reuse object code
efficiently.

CMakeLists.txt

@@ -1466,8 +1466,7 @@ endif()
 set(PLUGIN_INSTALL_VERSION_LIBDIR "${PLUGIN_INSTALL_LIBDIR}/${PLUGIN_PATH_ID}")
 set(PLUGIN_VERSION_DIR "plugins/${PLUGIN_PATH_ID}")
 
-add_subdirectory( capchild )
-add_subdirectory( caputils )
+add_subdirectory( capture )
 add_subdirectory( doc )
 add_subdirectory( docbook EXCLUDE_FROM_ALL )
 add_subdirectory( epan )

capchild/CMakeLists.txt

@@ -1,50 +0,0 @@
-# CMakeLists.txt
-
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-#
-
-
-set(CAPCHILD_SRC
-	capture_ifinfo.c
-	capture_sync.c
-)
-
-set_source_files_properties(
-	${CAPCHILD_SRC}
-	PROPERTIES
-	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
-)
-
-file(GLOB CAPCHILD_HEADERS capture_session.h)
-
-add_library(capchild STATIC
-	${CAPCHILD_SRC}
-)
-
-target_link_libraries(capchild
-	PRIVATE
-		wsutil
-		$<$<BOOL:${PCAP_FOUND}>:pcap::pcap>
-)
-
-set_target_properties(capchild PROPERTIES
-	LINK_FLAGS "${WS_LINK_FLAGS}"
-	FOLDER "Libs")
-
-#
-# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
-#
-# Local variables:
-# c-basic-offset: 8
-# tab-width: 8
-# indent-tabs-mode: t
-# End:
-#
-# vi: set shiftwidth=8 tabstop=8 noexpandtab:
-# :indentSize=8:tabSize=8:noTabs=false:
-#

capture/CMakeLists.txt

@@ -67,6 +67,33 @@ set_target_properties(caputils PROPERTIES
 	LINK_FLAGS "${WS_LINK_FLAGS}"
 	FOLDER "Libs")
 
+set(CAPCHILD_SRC
+	capture_ifinfo.c
+	capture_sync.c
+)
+
+set_source_files_properties(
+	${CAPCHILD_SRC}
+	PROPERTIES
+	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
+
+file(GLOB CAPCHILD_HEADERS capture_session.h)
+
+add_library(capchild STATIC
+	${CAPCHILD_SRC}
+)
+
+target_link_libraries(capchild
+	PRIVATE
+		wsutil
+		$<$<BOOL:${PCAP_FOUND}>:pcap::pcap>
+)
+
+set_target_properties(capchild PROPERTIES
+	LINK_FLAGS "${WS_LINK_FLAGS}"
+	FOLDER "Libs")
+
 CHECKAPI(
 	NAME
 	  caputils-base

capture/airpcap_loader.c

@@ -19,8 +19,8 @@
 #include <wsutil/file_util.h>
 #include <wsutil/802_11-utils.h>
 
-#include <caputils/airpcap.h>
-#include <caputils/airpcap_loader.h>
+#include <capture/airpcap.h>
+#include <capture/airpcap_loader.h>
 
 
 /*

capture/capture-pcap-util-unix.c

@@ -22,9 +22,9 @@
 # include <sys/capability.h>
 #endif
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
-#include "caputils/capture-pcap-util-int.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
+#include "capture/capture-pcap-util-int.h"
 
 #ifdef HAVE_PCAP_REMOTE
 GList *

capture/capture-pcap-util.c

@@ -64,9 +64,9 @@
 
 #endif /* defined(HAVE_PCAP_CREATE) && defined(__linux__) */
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
-#include "caputils/capture-pcap-util-int.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
+#include "capture/capture-pcap-util-int.h"
 
 #include "log.h"
 
@@ -78,7 +78,7 @@
 #endif
 
 #ifdef _WIN32
-#include "caputils/capture_win_ifnames.h" /* windows friendly interface names */
+#include "capture/capture_win_ifnames.h" /* windows friendly interface names */
 #endif
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__)

capture/capture-wpcap.c

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <glib.h>
 
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 
 gboolean has_wpcap = FALSE;
 
@@ -30,9 +30,9 @@ gboolean has_wpcap = FALSE;
 
 #include <epan/strutil.h>
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
-#include "caputils/capture-pcap-util-int.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
+#include "capture/capture-pcap-util-int.h"
 
 #include <wsutil/file_util.h>
 

capture/capture_ifinfo.c

@@ -20,12 +20,12 @@
 
 #include "capture_opts.h"
 
-#include "capchild/capture_session.h"
-#include "capchild/capture_sync.h"
+#include "capture/capture_session.h"
+#include "capture/capture_sync.h"
 #include "extcap.h"
 #include "log.h"
 
-#include <caputils/capture_ifinfo.h>
+#include <capture/capture_ifinfo.h>
 #include <wsutil/inet_addr.h>
 
 #ifdef HAVE_PCAP_REMOTE

capture/capture_sync.c

@@ -31,7 +31,7 @@
 # include <sys/wait.h>
 #endif
 
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 
 #ifndef _WIN32
 /*
@@ -67,12 +67,12 @@
 #include "file.h"
 
 #include "ui/capture.h"
-#include <capchild/capture_sync.h>
+#include <capture/capture_sync.h>
 
 #include "sync_pipe.h"
 
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif
 
 #include "ui/ws_ui_util.h"

capture/capture_win_ifnames.c

@@ -33,8 +33,8 @@
 
 #include "log.h"
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture_win_ifnames.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture_win_ifnames.h"
 
 #include <wsutil/file_util.h>
 

capture/iface_monitor.c

@@ -12,7 +12,7 @@
 
 #ifdef HAVE_LIBPCAP
 
-#include <caputils/iface_monitor.h>
+#include <capture/iface_monitor.h>
 #include "ws_attributes.h"
 
 #if defined(HAVE_LIBNL)

capture_opts.c

@@ -29,8 +29,8 @@
 #include <wsutil/file_util.h>
 #include <wsutil/ws_pipe.h>
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
 
 #include "ui/filter_files.h"
 

capture_opts.h

@@ -20,7 +20,7 @@
 
 #include <sys/types.h>     /* for gid_t */
 
-#include <caputils/capture_ifinfo.h>
+#include <capture/capture_ifinfo.h>
 #include "ringbuffer.h"
 
 #ifdef _WIN32

cmake/modules/FindPCAP.cmake

@@ -112,7 +112,7 @@ find_path(PCAP_INCLUDE_DIR
 )
 
 # On Windows we load wpcap.dll explicitly and probe its functions in
-# caputils\capture-wpcap.c. We don't want to link with pcap.lib since
+# capture\capture-wpcap.c. We don't want to link with pcap.lib since
 # that would bring in the non-capturing (null) pcap.dll from the vcpkg
 # library.
 if(WIN32)

docbook/wsdg_src/WSDG_chapter_build_intro.adoc

@@ -16,7 +16,7 @@ _/plugins/epan/{asterisk}_ directories
 * Capture file I/O - using Wireshark’s own wiretap library
 
 * Capture - using the libpcap and Npcap libraries, in _dumpcap.c_ and
-the _/capchild_ and _/caputils directories
+the _/capture_ directory
 
 * User interface - using Qt and associated libraries
 

dumpcap.c

@@ -55,11 +55,11 @@
 
 #include "ringbuffer.h"
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
-#include "caputils/capture-pcap-util-int.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
+#include "capture/capture-pcap-util-int.h"
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif /* _WIN32 */
 
 #include "writecap/pcapio.h"
@@ -74,8 +74,8 @@
 #include "sync_pipe.h"
 
 #include "capture_opts.h"
-#include <capchild/capture_session.h>
-#include <capchild/capture_sync.h>
+#include <capture/capture_session.h>
+#include <capture/capture_sync.h>
 
 #include "wsutil/tempfile.h"
 #include "log.h"
@@ -88,7 +88,7 @@
 #include "wsutil/please_report_bug.h"
 #include "wsutil/glib-compat.h"
 
-#include "caputils/ws80211_utils.h"
+#include "capture/ws80211_utils.h"
 
 #include "extcap.h"
 

rawshark.c

@@ -91,14 +91,14 @@
 #include <cli_main.h>
 #include <version_info.h>
 
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 
 #include "extcap.h"
 
 #ifdef HAVE_LIBPCAP
 #include <setjmp.h>
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
 #include "log.h"

tshark.c

@@ -101,15 +101,15 @@
 
 #include "capture_opts.h"
 
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 
 #ifdef HAVE_LIBPCAP
-#include "caputils/capture_ifinfo.h"
+#include "capture/capture_ifinfo.h"
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif /* _WIN32 */
-#include <capchild/capture_session.h>
-#include <capchild/capture_sync.h>
+#include <capture/capture_session.h>
+#include <capture/capture_sync.h>
 #include <ui/capture_info.h>
 #endif /* HAVE_LIBPCAP */
 #include "log.h"

ui/capture.c

@@ -22,17 +22,17 @@
 #include <epan/dfilter/dfilter.h>
 #include "file.h"
 #include "ui/capture.h"
-#include "caputils/capture_ifinfo.h"
-#include <capchild/capture_sync.h>
+#include "capture/capture_ifinfo.h"
+#include <capture/capture_sync.h>
 #include "ui/capture_info.h"
 #include "ui/capture_ui_utils.h"
 #include "ui/util.h"
 #include "ui/urls.h"
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 #include <epan/prefs.h>
 
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif
 
 #include "ui/simple_dialog.h"

ui/capture.h

@@ -20,7 +20,7 @@
 #include "capture_opts.h"
 #include "capture_info.h"
 #include "cfile.h"
-#include "capchild/capture_session.h"
+#include "capture/capture_session.h"
 
 #ifdef __cplusplus
 extern "C" {

ui/capture_info.h

@@ -19,7 +19,7 @@
 #define __CAPTURE_INFO_H__
 
 #include "capture_opts.h"
-#include <capchild/capture_session.h>
+#include <capture/capture_session.h>
 #include <epan/capture_dissectors.h>
 
 #ifdef __cplusplus

ui/capture_ui_utils.c

@@ -19,7 +19,7 @@
 
 #include "epan/prefs.h"
 #include "epan/ex-opt.h"
-#include "caputils/capture_ifinfo.h"
+#include "capture/capture_ifinfo.h"
 #include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "wiretap/wtap.h"

ui/qt/interface_frame.cpp

@@ -11,10 +11,10 @@
 #include "config.h"
 #include <ui_interface_frame.h>
 
-#include "caputils/capture_ifinfo.h"
+#include "capture/capture_ifinfo.h"
 
 #ifdef Q_OS_WIN
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif
 
 #include "ui/qt/interface_frame.h"
@@ -362,7 +362,7 @@ void InterfaceFrame::resetInterfaceTreeDisplay()
     }
 }
 
-// XXX Should this be in caputils/capture-pcap-util.[ch]?
+// XXX Should this be in capture/capture-pcap-util.[ch]?
 bool InterfaceFrame::haveLocalCapturePermissions() const
 {
 #ifdef Q_OS_MAC

ui/qt/main.cpp

@@ -101,19 +101,19 @@
 #include <ui/qt/widgets/splash_overlay.h>
 #include "ui/qt/wireshark_application.h"
 
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 
 #include <QMessageBox>
 #include <QScreen>
 
 #ifdef _WIN32
-#  include "caputils/capture-wpcap.h"
+#  include "capture/capture-wpcap.h"
 #  include <wsutil/file_util.h>
 #endif /* _WIN32 */
 
 #ifdef HAVE_AIRPCAP
-#  include <caputils/airpcap.h>
-#  include <caputils/airpcap_loader.h>
+#  include <capture/airpcap.h>
+#  include <capture/airpcap_loader.h>
 //#  include "airpcap_dlg.h"
 //#  include "airpcap_gui_utils.h"
 #endif

ui/qt/main_status_bar.h

@@ -14,7 +14,7 @@
 
 #include "cfile.h"
 
-#include "capchild/capture_session.h"
+#include "capture/capture_session.h"
 
 #include <ui/qt/utils/field_information.h>
 #include <ui/qt/widgets/label_stack.h>

ui/qt/main_window.cpp

@@ -31,7 +31,7 @@ DIAG_ON(frame-larger-than=)
 
 #ifdef HAVE_LIBPCAP
 #include "ui/capture.h"
-#include <capchild/capture_session.h>
+#include <capture/capture_session.h>
 #endif
 
 #include "ui/alert_box.h"

ui/qt/main_window.h

@@ -54,7 +54,7 @@
 #ifdef HAVE_LIBPCAP
 #include "capture_opts.h"
 #endif
-#include <capchild/capture_session.h>
+#include <capture/capture_session.h>
 
 #include <QMainWindow>
 #include <QPointer>

ui/qt/manage_interfaces_dialog.cpp

@@ -21,7 +21,7 @@
 #ifdef HAVE_PCAP_REMOTE
 #include "ui/qt/remote_capture_dialog.h"
 #include "ui/qt/remote_settings_dialog.h"
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 #include "ui/recent.h"
 #endif
 #include "ui/iface_lists.h"

ui/qt/models/interface_tree_model.cpp

@@ -14,7 +14,7 @@
 
 #ifdef HAVE_LIBPCAP
 #include "ui/capture.h"
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 #include "capture_opts.h"
 #include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"

ui/qt/models/pref_models.cpp

@@ -13,7 +13,7 @@
 
 #ifdef HAVE_LIBPCAP
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif /* _WIN32 */
 #endif /* HAVE_LIBPCAP */
 

ui/qt/remote_capture_dialog.cpp

@@ -17,7 +17,7 @@
 #include "remote_capture_dialog.h"
 #include <ui_remote_capture_dialog.h>
 #include "capture_opts.h"
-#include "caputils/capture-pcap-util.h"
+#include "capture/capture-pcap-util.h"
 #include "ui/capture_ui_utils.h"
 #include "epan/prefs.h"
 #include "epan/to_str.h"

ui/qt/wireless_frame.cpp

@@ -14,10 +14,10 @@
 
 #include <glib.h>
 
-#include <capchild/capture_session.h>
-#include <capchild/capture_sync.h>
+#include <capture/capture_session.h>
+#include <capture/capture_sync.h>
 
-#include <caputils/ws80211_utils.h>
+#include <capture/ws80211_utils.h>
 
 #include "ui/ws_ui_util.h"
 #include <wsutil/utf8_entities.h>

ui/qt/wireshark_application.cpp

@@ -48,7 +48,7 @@
 
 #include "extcap.h"
 #ifdef HAVE_LIBPCAP
-#include <caputils/iface_monitor.h>
+#include <capture/iface_monitor.h>
 #endif
 
 #include "ui/filter_files.h"