diff options
| -rw-r--r-- | capture_opts.c | 3 | ||||
| -rw-r--r-- | sharkd.c | 2 | ||||
| -rw-r--r-- | tshark.c | 2 | ||||
| -rw-r--r-- | ui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ui/qt/filter_dialog.cpp | 3 | ||||
| -rw-r--r-- | ui/qt/main_application.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/widgets/capture_filter_edit.cpp | 2 | ||||
| -rw-r--r-- | ui/qt/widgets/field_filter_edit.cpp | 3 | ||||
| -rw-r--r-- | wsutil/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | wsutil/filter_files.c (renamed from ui/filter_files.c) | 5 | ||||
| -rw-r--r-- | wsutil/filter_files.h (renamed from ui/filter_files.h) | 14 |
11 files changed, 21 insertions, 17 deletions
diff --git a/capture_opts.c b/capture_opts.c index 84b880caf5..40d571d3dd 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -35,12 +35,11 @@ #include <wsutil/file_util.h> #include <wsutil/ws_pipe.h> #include <wsutil/ws_assert.h> +#include <wsutil/filter_files.h> #include "capture/capture_ifinfo.h" #include "capture/capture-pcap-util.h" -#include "ui/filter_files.h" - static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_pipe); @@ -46,7 +46,7 @@ #include "ui/util.h" #include "ui/ws_ui_util.h" #include "ui/decode_as_utils.h" -#include "ui/filter_files.h" +#include "wsutil/filter_files.h" #include "ui/tap_export_pdu.h" #include "ui/failure_message.h" #include "wtap.h" @@ -74,7 +74,7 @@ #include "ui/util.h" #include "ui/ws_ui_util.h" #include "ui/decode_as_utils.h" -#include "ui/filter_files.h" +#include "wsutil/filter_files.h" #include "ui/cli/tshark-tap.h" #include "ui/cli/tap-exportobject.h" #include "ui/tap_export_pdu.h" diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 92de384004..c1f7e56c7c 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -18,7 +18,6 @@ set(NONGENERATED_UI_SRC help_url.c failure_message.c file_dialog.c - filter_files.c firewall_rules.c iface_toolbar.c iface_lists.c diff --git a/ui/qt/filter_dialog.cpp b/ui/qt/filter_dialog.cpp index 36d138d7b5..5e0a948efa 100644 --- a/ui/qt/filter_dialog.cpp +++ b/ui/qt/filter_dialog.cpp @@ -13,8 +13,7 @@ #include <glib.h> -#include <ui/filter_files.h> - +#include <wsutil/filter_files.h> #include <wsutil/filesystem.h> #include "filter_dialog.h" diff --git a/ui/qt/main_application.cpp b/ui/qt/main_application.cpp index 9c9d19fa12..3a8f7bfa4e 100644 --- a/ui/qt/main_application.cpp +++ b/ui/qt/main_application.cpp @@ -52,7 +52,7 @@ #include <capture/iface_monitor.h> #endif -#include "ui/filter_files.h" +#include "wsutil/filter_files.h" #include "ui/capture_globals.h" #include "ui/software_update.h" #include "ui/last_open_dir.h" diff --git a/ui/qt/widgets/capture_filter_edit.cpp b/ui/qt/widgets/capture_filter_edit.cpp index c9d4c39073..2e694463bd 100644 --- a/ui/qt/widgets/capture_filter_edit.cpp +++ b/ui/qt/widgets/capture_filter_edit.cpp @@ -16,7 +16,7 @@ #include "capture_opts.h" #include <ui/capture_globals.h> -#include <ui/filter_files.h> +#include <wsutil/filter_files.h> #include <wsutil/utf8_entities.h> #include <ui/qt/widgets/capture_filter_edit.h> diff --git a/ui/qt/widgets/field_filter_edit.cpp b/ui/qt/widgets/field_filter_edit.cpp index f592550fce..7aebf051ea 100644 --- a/ui/qt/widgets/field_filter_edit.cpp +++ b/ui/qt/widgets/field_filter_edit.cpp @@ -13,8 +13,7 @@ #include <epan/dfilter/dfilter.h> -#include <ui/filter_files.h> - +#include <wsutil/filter_files.h> #include <wsutil/utf8_entities.h> #include <ui/qt/widgets/field_filter_edit.h> diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 4f511b6bb2..3be5a384c9 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -123,6 +123,7 @@ set(WSUTIL_COMMON_FILES eax.c feature_list.c filesystem.c + filter_files.c g711.c inet_addr.c interface.c diff --git a/ui/filter_files.c b/wsutil/filter_files.c index df139951af..014cdfd567 100644 --- a/ui/filter_files.c +++ b/wsutil/filter_files.c @@ -9,7 +9,8 @@ */ #include <config.h> -#define WS_LOG_DOMAIN LOG_DOMAIN_MAIN +#define WS_LOG_DOMAIN LOG_DOMAIN_WSUTIL +#include "filter_files.h" #include <stdio.h> #include <string.h> @@ -23,8 +24,6 @@ #include <wsutil/wslog.h> #include <wsutil/ws_assert.h> -#include "ui/filter_files.h" - /* * List of capture filters - saved. */ diff --git a/ui/filter_files.h b/wsutil/filter_files.h index 532e17d75b..f3e67872b8 100644 --- a/ui/filter_files.h +++ b/wsutil/filter_files.h @@ -9,8 +9,10 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef __UI_FILTERS_H__ -#define __UI_FILTERS_H__ +#ifndef __FILTER_FILES_H__ +#define __FILTER_FILES_H__ + +#include <wireshark.h> #ifdef __cplusplus extern "C" { @@ -52,23 +54,27 @@ typedef struct { * * On error, report the error via the UI. */ +WS_DLL_PUBLIC void read_filter_list(filter_list_type_t list_type); /* * Get a pointer to the first entry in a filter list. */ +WS_DLL_PUBLIC GList *get_filter_list_first(filter_list_type_t list); /* * Add a new filter to the end of a list. * Returns a pointer to the newly-added entry. */ +WS_DLL_PUBLIC GList *add_to_filter_list(filter_list_type_t list, const char *name, const char *expression); /* * Remove a filter from a list. */ +WS_DLL_PUBLIC void remove_from_filter_list(filter_list_type_t list, GList *fl_entry); /* @@ -76,15 +82,17 @@ void remove_from_filter_list(filter_list_type_t list, GList *fl_entry); * * On error, report the error via the UI. */ +WS_DLL_PUBLIC void save_filter_list(filter_list_type_t list_type); /* * Free all filter lists */ +WS_DLL_PUBLIC void free_filter_lists(void); #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __UI_FILTERS_H__ */ +#endif /* __FILTER_FILES_H__ */ |