Move capture_opts.[ch] to the ui library.

Build dumpcap with ui/capture_opts.c, rather than linking it with libui; libui is built to link with the libwsutil *dynamic* library, and attempting to link it with the *static* libwsutil library that's used with dumpcap will fail on Windows.
crondaemon · Dec 1, 2024 · 31b31e1 · 31b31e1
1 parent 45d855a
commit 31b31e1
Show file tree

Hide file tree

Showing 32 changed files with 37 additions and 46 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2719,13 +2719,6 @@ add_library(shark_common OBJECT
 	sync_pipe_write.c
 )
 add_library(cli_main OBJECT cli_main.c)
-add_library(capture_opts OBJECT capture_opts.c)
-target_include_directories(capture_opts SYSTEM PRIVATE ${PCAP_INCLUDE_DIRS})
-set_target_properties(shark_common cli_main capture_opts
-	PROPERTIES
-	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
-)
-
 
 if(BUILD_wireshark AND QT_FOUND)
 	set(WIRESHARK_SRC
@@ -2735,7 +2728,6 @@ if(BUILD_wireshark AND QT_FOUND)
 		${PLATFORM_UI_SRC}
 	)
 	set(wireshark_FILES
-		$<TARGET_OBJECTS:capture_opts>
 		$<TARGET_OBJECTS:shark_common>
 		${WIRESHARK_SRC}
 		${PLATFORM_UI_RC_FILES}
@@ -2751,7 +2743,6 @@ if(BUILD_stratoshark AND QT_FOUND)
 		${PLATFORM_UI_SRC}
 	)
 	set(stratoshark_FILES
-		$<TARGET_OBJECTS:capture_opts>
 		$<TARGET_OBJECTS:shark_common>
 		${STRATOSHARK_SRC}
 		${PLATFORM_UI_RC_FILES}
@@ -3165,7 +3156,6 @@ if(BUILD_tshark)
 		${WIN_WS2_32_LIBRARY}
 	)
 	set(tshark_FILES
-		$<TARGET_OBJECTS:capture_opts>
 		$<TARGET_OBJECTS:cli_main>
 		$<TARGET_OBJECTS:shark_common>
 		tshark-tap-register.c
@@ -3459,13 +3449,13 @@ if(BUILD_dumpcap AND PCAP_FOUND)
 		capture/capture-pcap-util.c
 	)
 	set(dumpcap_FILES
-		capture_opts.c
 		cli_main.c
 		dumpcap.c
 		ringbuffer.c
 		sync_pipe_write.c
 		capture/iface_monitor.c
 		capture/ws80211_utils.c
+		ui/capture_opts.c
 		${CAPUTILS_SRC}
 	)
 	set_executable_resources(dumpcap "Dumpcap" UNIQUE_RC)

diff --git a/capture/capture-pcap-util.h b/capture/capture-pcap-util.h
@@ -18,7 +18,7 @@
 
 #include <pcap.h>
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 
 #endif
 

diff --git a/capture/capture_ifinfo.c b/capture/capture_ifinfo.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 
 #include "capture/capture_session.h"
 #include "capture/capture_sync.h"

diff --git a/capture/capture_session.h b/capture/capture_session.h
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #endif
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 
 #include <epan/fifo_string_cache.h>
 #include <wsutil/processes.h>

diff --git a/dumpcap.c b/dumpcap.c
@@ -70,7 +70,7 @@
 
 #include "sync_pipe.h"
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 #include <capture/capture_session.h>
 #include <capture/capture_sync.h>
 

diff --git a/epan/prefs.c b/epan/prefs.c
@@ -34,7 +34,7 @@
 #include <epan/strutil.h>
 #include <epan/column.h>
 #include <epan/decode_as.h>
-#include <capture_opts.h>
+#include <ui/capture_opts.h>
 #include <wsutil/file_util.h>
 #include <wsutil/report_message.h>
 #include <wsutil/wslog.h>

diff --git a/extcap.c b/extcap.c
@@ -44,7 +44,7 @@
 #include <wsutil/version_info.h>
 
 #include "capture/capture_session.h"
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 
 #include "extcap.h"
 #include "extcap_parser.h"

diff --git a/tshark.c b/tshark.c
@@ -83,6 +83,7 @@
 #include "ui/dissect_opts.h"
 #include "ui/ssl_key_export.h"
 #include "ui/failure_message.h"
+#include "ui/capture_opts.h"
 #if defined(HAVE_LIBSMI)
 #include "epan/oids.h"
 #endif
@@ -97,8 +98,6 @@
 #include <epan/exported_pdu.h>
 #include <epan/secrets.h>
 
-#include "capture_opts.h"
-
 #include "capture/capture-pcap-util.h"
 
 #ifdef HAVE_LIBPCAP

diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
@@ -10,6 +10,7 @@
 set(NONGENERATED_UI_SRC
 	alert_box.c
 	capture.c
+	capture_opts.c
 	capture_ui_utils.c
 	commandline.c
 	decode_as_utils.c

diff --git a/ui/capture.h b/ui/capture.h
@@ -18,7 +18,7 @@
  *  Capture related things.
  */
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 #include "capture_info.h"
 #include "cfile.h"
 #include "capture/capture_session.h"

diff --git a/ui/capture_globals.h b/ui/capture_globals.h
@@ -12,7 +12,7 @@
 #ifndef __CAPTURE_GLOBALS_H__
 #define __CAPTURE_GLOBALS_H__
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/ui/capture_info.h b/ui/capture_info.h
@@ -19,7 +19,7 @@
 #ifndef __CAPTURE_INFO_H__
 #define __CAPTURE_INFO_H__
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 #include <capture/capture_session.h>
 #include <epan/capture_dissectors.h>
 

diff --git a/capture_opts.c → ui/capture_opts.c b/capture_opts.c → ui/capture_opts.c
diff --git a/capture_opts.h → ui/capture_opts.h b/capture_opts.h → ui/capture_opts.h
diff --git a/ui/capture_ui_utils.h b/ui/capture_ui_utils.h
@@ -12,7 +12,7 @@
 #ifndef __CAPTURE_UI_UTILS_H__
 #define __CAPTURE_UI_UTILS_H__
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/ui/commandline.c b/ui/commandline.c
@@ -38,14 +38,15 @@
 #include <epan/prefs-int.h>
 #include <epan/stat_tap_ui.h>
 
-#include "capture_opts.h"
 #include "persfilepath_opt.h"
 #include "preference_utils.h"
 #include "recent.h"
 #include "decode_as_utils.h"
 
 #include "../file.h"
 
+#include "ui/capture_opts.h"
+
 #include "ui/dissect_opts.h"
 
 #include "ui/commandline.h"

diff --git a/ui/preference_utils.c b/ui/preference_utils.c
@@ -23,7 +23,7 @@
 #include <ui/recent.h>
 
 #ifdef HAVE_LIBPCAP
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 #include "ui/capture_globals.h"
 #endif
 

diff --git a/ui/qt/capture_filter_syntax_worker.cpp b/ui/qt/capture_filter_syntax_worker.cpp
@@ -16,7 +16,7 @@
 #endif
 #include <pcap.h>
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 #include "ui/capture_globals.h"
 #endif
 #include "extcap.h"

diff --git a/ui/qt/capture_options_dialog.cpp b/ui/qt/capture_options_dialog.cpp
@@ -20,7 +20,6 @@
 #include "main_application.h"
 
 #include "extcap.h"
-#include "capture_opts.h"
 
 #ifdef HAVE_LIBPCAP
 
@@ -29,6 +28,7 @@
 #include <QTimer>
 
 #include "ringbuffer.h"
+#include "ui/capture_opts.h"
 #include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #include "ui/iface_lists.h"

diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp
@@ -19,8 +19,8 @@
 #include <pcap.h>
 #endif
 
-#include "capture_opts.h"
 #include <wiretap/wtap.h>
+#include "ui/capture_opts.h"
 #include "ui/capture_globals.h"
 
 #include "main_application.h"

diff --git a/ui/qt/interface_frame.cpp b/ui/qt/interface_frame.cpp
@@ -30,7 +30,7 @@
 #include "extcap.h"
 
 #include <ui/recent.h>
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 #include "ui/capture_globals.h"
 #include <ui/iface_lists.h>
 #include <wsutil/utf8_entities.h>

diff --git a/ui/qt/interface_toolbar.cpp b/ui/qt/interface_toolbar.cpp
@@ -31,7 +31,7 @@ DIAG_ON(restrict)
 #include "main_application.h"
 #include <ui_interface_toolbar.h>
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 #include "ui/capture_globals.h"
 #include "sync_pipe.h"
 #include "wsutil/file_util.h"

diff --git a/ui/qt/manage_interfaces_dialog.cpp b/ui/qt/manage_interfaces_dialog.cpp
@@ -13,7 +13,7 @@
 
 #include "epan/prefs.h"
 #include "epan/to_str.h"
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 #include "ui/capture_globals.h"
 #include "ui/qt/capture_options_dialog.h"
 #include <ui/qt/models/interface_tree_cache_model.h>

diff --git a/ui/qt/manage_interfaces_dialog.h b/ui/qt/manage_interfaces_dialog.h
@@ -12,7 +12,7 @@
 
 #include <config.h>
 
-#include "capture_opts.h"
+#include <ui/capture_opts.h>
 
 #include <ui/qt/models/interface_tree_cache_model.h>
 #include <ui/qt/models/interface_sort_filter_model.h>

diff --git a/ui/qt/models/interface_tree_model.cpp b/ui/qt/models/interface_tree_model.cpp
@@ -15,7 +15,7 @@
 #ifdef HAVE_LIBPCAP
 #include "ui/capture.h"
 #include "capture/capture-pcap-util.h"
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 #include "ui/capture_ui_utils.h"
 #include "ui/capture_globals.h"
 #endif

diff --git a/ui/qt/remote_capture_dialog.cpp b/ui/qt/remote_capture_dialog.cpp
@@ -16,7 +16,7 @@
 #include "ui/capture_globals.h"
 #include "remote_capture_dialog.h"
 #include <ui_remote_capture_dialog.h>
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 #include "capture/capture-pcap-util.h"
 #include "ui/capture_ui_utils.h"
 #include "epan/prefs.h"

diff --git a/ui/qt/remote_capture_dialog.h b/ui/qt/remote_capture_dialog.h
@@ -14,7 +14,7 @@
 
 #ifdef HAVE_PCAP_REMOTE
 #include <QDialog>
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 
 namespace Ui {
 class RemoteCaptureDialog;

diff --git a/ui/qt/remote_settings_dialog.h b/ui/qt/remote_settings_dialog.h
@@ -14,7 +14,7 @@
 
 #ifdef HAVE_PCAP_REMOTE
 #include <QDialog>
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 
 namespace Ui {
 class RemoteSettingsDialog;

diff --git a/ui/qt/widgets/capture_filter_edit.cpp b/ui/qt/widgets/capture_filter_edit.cpp
@@ -11,7 +11,7 @@
 
 #include <epan/proto.h>
 
-#include "capture_opts.h"
+#include "ui/capture_opts.h"
 
 #include <ui/capture_globals.h>
 #include <wsutil/filter_files.h>

diff --git a/ui/qt/wireshark_main_window.h b/ui/qt/wireshark_main_window.h
@@ -44,13 +44,13 @@
 
 #include "ui/ws_ui_util.h"
 #include "ui/iface_toolbar.h"
+#ifdef HAVE_LIBPCAP
+#include "ui/capture_opts.h"
+#endif
 
 #include <epan/plugin_if.h>
 #include <epan/timestamp.h>
 
-#ifdef HAVE_LIBPCAP
-#include "capture_opts.h"
-#endif
 #include <capture/capture_session.h>
 
 #include <QMainWindow>

diff --git a/ui/recent.c b/ui/recent.c
@@ -16,16 +16,16 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#ifdef HAVE_PCAP_REMOTE
-#include <capture_opts.h>
-#endif
 #include <wsutil/application_flavor.h>
 #include <wsutil/filesystem.h>
 #include <epan/prefs.h>
 #include <epan/prefs-int.h>
 #include <epan/column.h>
 #include <epan/value_string.h>
 
+#ifdef HAVE_PCAP_REMOTE
+#include "ui/capture_opts.h"
+#endif
 #include "ui/util.h"
 #include "ui/recent.h"
 #include "ui/recent_utils.h"

diff --git a/ui/stratoshark/stratoshark_main_window.h b/ui/stratoshark/stratoshark_main_window.h
@@ -43,13 +43,13 @@
 
 #include "ui/ws_ui_util.h"
 #include "ui/iface_toolbar.h"
+#ifdef HAVE_LIBPCAP
+#include "ui/capture_opts.h"
+#endif
 
 #include <epan/plugin_if.h>
 #include <epan/timestamp.h>
 
-#ifdef HAVE_LIBPCAP
-#include "capture_opts.h"
-#endif
 #include <capture/capture_session.h>
 
 #include <QMainWindow>
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
     #include <pcap.h>
-    #include "capture_opts.h"
+    #include "ui/capture_opts.h"
     #endif
@@ Expand Down @@