osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Move the filter file reading code to libui. 

It doesn't belong in libwireshark, as it doesn't affect dissection, but
it *does* belong in libui, as it's helper code for the UIs.

Change-Id: I8a5e0640a299a08e9ec1917dd253197438ebfdbc
Reviewed-on: https://code.wireshark.org/review/20974
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2017-04-08 21:24:45 -07:00
parent 62b342443d
commit 77cad8561c
16 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -1875,7 +1875,6 @@ if( (BUILD_wireshark AND QT_FOUND) OR (BUILD_wireshark_gtk AND GTK_FOUND) )
capture_opts.c capture_opts.c
file.c file.c
fileset.c fileset.c
filter_files.c
summary.c summary.c
${SHARK_COMMON_SRC} ${SHARK_COMMON_SRC}
${PLATFORM_UI_SRC} ${PLATFORM_UI_SRC}
@ -2243,7 +2242,6 @@ if(BUILD_tshark)
) )
set(tshark_FILES set(tshark_FILES
capture_opts.c capture_opts.c
filter_files.c
tshark-tap-register.c tshark-tap-register.c
tshark.c tshark.c
${TSHARK_TAP_SRC} ${TSHARK_TAP_SRC}
@ -2305,7 +2303,6 @@ if(BUILD_sharkd)
${APPLE_SYSTEM_CONFIGURATION_LIBRARY} ${APPLE_SYSTEM_CONFIGURATION_LIBRARY}
) )
set(sharkd_FILES set(sharkd_FILES
filter_files.c
sharkd.c sharkd.c
sharkd_daemon.c sharkd_daemon.c
sharkd_session.c sharkd_session.c
@ -2478,6 +2475,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
writecap writecap
wsutil wsutil
caputils caputils
ui
${PCAP_LIBRARIES} ${PCAP_LIBRARIES}
${CAP_LIBRARIES} ${CAP_LIBRARIES}
${GLIB2_LIBRARIES} ${GLIB2_LIBRARIES}
@ -2492,7 +2490,6 @@ if(BUILD_dumpcap AND PCAP_FOUND)
capture_stop_conditions.c capture_stop_conditions.c
conditions.c conditions.c
dumpcap.c dumpcap.c
filter_files.c
ringbuffer.c ringbuffer.c
sync_pipe_write.c sync_pipe_write.c
ws_version_info.c ws_version_info.c

6
Makefile.am
View File

@ -419,7 +419,6 @@ WIRESHARK_COMMON_SRC = \
capture_opts.c \ capture_opts.c \
file.c \ file.c \
fileset.c \ fileset.c \
filter_files.c \
summary.c \ summary.c \
ws_version_info.c ws_version_info.c
@ -427,7 +426,6 @@ WIRESHARK_COMMON_SRC = \
WIRESHARK_COMMON_INCLUDES = \ WIRESHARK_COMMON_INCLUDES = \
capture_info.h \ capture_info.h \
capture_opts.h \ capture_opts.h \
filter_files.h \
globals.h \ globals.h \
log.h \ log.h \
summary.h \ summary.h \
@ -508,7 +506,6 @@ endif
tshark_SOURCES = \ tshark_SOURCES = \
$(SHARK_COMMON_SRC) \ $(SHARK_COMMON_SRC) \
capture_opts.c \ capture_opts.c \
filter_files.c \
tshark.c \ tshark.c \
ws_version_info.c ws_version_info.c
@ -580,7 +577,6 @@ rawshark_LDADD = \
sharkd_SOURCES = \ sharkd_SOURCES = \
$(SHARK_COMMON_SRC) \ $(SHARK_COMMON_SRC) \
filter_files.c \
sharkd.c \ sharkd.c \
sharkd.h \ sharkd.h \
sharkd_daemon.c \ sharkd_daemon.c \
@ -722,7 +718,6 @@ dumpcap_SOURCES = \
capture_stop_conditions.c \ capture_stop_conditions.c \
conditions.c \ conditions.c \
dumpcap.c \ dumpcap.c \
filter_files.c \
ringbuffer.c \ ringbuffer.c \
sync_pipe_write.c \ sync_pipe_write.c \
ws_version_info.c ws_version_info.c
@ -736,6 +731,7 @@ dumpcap_LDFLAGS = $(AM_LDFLAGS) $(PIE_LDFLAGS)
# Libraries with which to link dumpcap. # Libraries with which to link dumpcap.
dumpcap_LDADD = \ dumpcap_LDADD = \
caputils/libcaputils.a \ caputils/libcaputils.a \
ui/libui.a \
writecap/libwritecap.a \ writecap/libwritecap.a \
wsutil/libwsutil.la \ wsutil/libwsutil.la \
@GLIB_LIBS@ \ @GLIB_LIBS@ \

2
capture_opts.c
View File

@ -43,7 +43,7 @@
#include "caputils/capture_ifinfo.h" #include "caputils/capture_ifinfo.h"
#include "caputils/capture-pcap-util.h" #include "caputils/capture-pcap-util.h"
#include "filter_files.h" #include "ui/filter_files.h"
static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_pipe); static gboolean capture_opts_output_to_pipe(const char *save_file, gboolean *is_pipe);

2
sharkd.c
View File

@ -59,9 +59,9 @@
#include "ui/util.h" #include "ui/util.h"
#include "ui/ui_util.h" #include "ui/ui_util.h"
#include "ui/decode_as_utils.h" #include "ui/decode_as_utils.h"
#include "ui/filter_files.h"
#include "ui/tap_export_pdu.h" #include "ui/tap_export_pdu.h"
#include "register.h" #include "register.h"
#include "filter_files.h"
#include <epan/epan_dissect.h> #include <epan/epan_dissect.h>
#include <epan/tap.h> #include <epan/tap.h>

2
tshark.c
View File

@ -84,6 +84,7 @@
#include "ui/util.h" #include "ui/util.h"
#include "ui/ui_util.h" #include "ui/ui_util.h"
#include "ui/decode_as_utils.h" #include "ui/decode_as_utils.h"
#include "ui/filter_files.h"
#include "ui/cli/tshark-tap.h" #include "ui/cli/tshark-tap.h"
#include "ui/cli/tap-exportobject.h" #include "ui/cli/tap-exportobject.h"
#include "ui/tap_export_pdu.h" #include "ui/tap_export_pdu.h"
@ -95,7 +96,6 @@
#include "epan/geoip_db.h" #include "epan/geoip_db.h"
#endif #endif
#include "register.h" #include "register.h"
#include "filter_files.h"
#include <epan/epan_dissect.h> #include <epan/epan_dissect.h>
#include <epan/tap.h> #include <epan/tap.h>
#include <epan/stat_tap_ui.h> #include <epan/stat_tap_ui.h>

1
ui/CMakeLists.txt
View File

@ -31,6 +31,7 @@ set(COMMON_UI_SRC
export_object_ui.c export_object_ui.c
export_pdu_ui_utils.c export_pdu_ui_utils.c
help_url.c help_url.c
filter_files.c
firewall_rules.c firewall_rules.c
iface_lists.c iface_lists.c
io_graph_item.c io_graph_item.c

2
ui/Makefile.am
View File

@ -57,6 +57,7 @@ WIRESHARK_UI_SRC = \
dissect_opts.c \ dissect_opts.c \
export_object_ui.c \ export_object_ui.c \
export_pdu_ui_utils.c \ export_pdu_ui_utils.c \
filter_files.c \
firewall_rules.c \ firewall_rules.c \
iface_lists.c \ iface_lists.c \
io_graph_item.c \ io_graph_item.c \
@ -101,6 +102,7 @@ WIRESHARK_UI_INCLUDES = \
export_pdu_ui_utils.h \ export_pdu_ui_utils.h \
last_open_dir.h \ last_open_dir.h \
file_dialog.h \ file_dialog.h \
filter_files.h \
help_url.h \ help_url.h \
packet_list_utils.h \ packet_list_utils.h \
firewall_rules.h \ firewall_rules.h \

4
filter_files.c → ui/filter_files.c
View File

@ -1,4 +1,4 @@
/* filters.c /* filter_files.c
* Code for reading and writing the filters file. * Code for reading and writing the filters file.
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer
@ -32,7 +32,7 @@
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>
#include <wsutil/glib-compat.h> #include <wsutil/glib-compat.h>
#include "filter_files.h" #include "ui/filter_files.h"
/* /*
* Old filter file name. * Old filter file name.

2
filter_files.h → ui/filter_files.h
View File

@ -1,4 +1,4 @@
/* filters.h /* filter_filess.h
* Declarations of routines for reading and writing the filters file. * Declarations of routines for reading and writing the filters file.
* *
* Wireshark - Network traffic analyzer * Wireshark - Network traffic analyzer

2
ui/gtk/filter_dlg.c
View File

@ -30,7 +30,7 @@
#include <epan/prefs.h> #include <epan/prefs.h>
#include <epan/column-info.h> #include <epan/column-info.h>
#include "filter_files.h" #include "ui/filter_files.h"
#include "ui/simple_dialog.h" #include "ui/simple_dialog.h"
#include "ui/main_statusbar.h" #include "ui/main_statusbar.h"

2
ui/gtk/main.c
View File

@ -101,7 +101,7 @@
#include "ui/alert_box.h" #include "ui/alert_box.h"
#include "ui/console.h" #include "ui/console.h"
#include "ui/decode_as_utils.h" #include "ui/decode_as_utils.h"
#include "filter_files.h" #include "ui/filter_files.h"
#include "ui/main_statusbar.h" #include "ui/main_statusbar.h"
#include "ui/persfilepath_opt.h" #include "ui/persfilepath_opt.h"
#include "ui/preference_utils.h" #include "ui/preference_utils.h"

2
ui/qt/capture_filter_edit.cpp
View File

@ -28,7 +28,7 @@
#include "capture_opts.h" #include "capture_opts.h"
#include <ui/capture_globals.h> #include <ui/capture_globals.h>
#include <filter_files.h> #include <ui/filter_files.h>
#include <wsutil/utf8_entities.h> #include <wsutil/utf8_entities.h>
#include "capture_filter_edit.h" #include "capture_filter_edit.h"

2
ui/qt/display_filter_edit.cpp
View File

@ -25,7 +25,7 @@
#include <epan/dfilter/dfilter.h> #include <epan/dfilter/dfilter.h>
#include <filter_files.h> #include <ui/filter_files.h>
#include <wsutil/utf8_entities.h> #include <wsutil/utf8_entities.h>

2
ui/qt/field_filter_edit.cpp
View File

@ -25,7 +25,7 @@
#include <epan/dfilter/dfilter.h> #include <epan/dfilter/dfilter.h>
#include <filter_files.h> #include <ui/filter_files.h>
#include <wsutil/utf8_entities.h> #include <wsutil/utf8_entities.h>

2
ui/qt/filter_dialog.cpp
View File

@ -25,7 +25,7 @@
#include <glib.h> #include <glib.h>
#include <filter_files.h> #include <ui/filter_files.h>
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>

2
ui/qt/wireshark_application.cpp
View File

@ -65,7 +65,7 @@
#endif #endif
#include "ui/capture.h" #include "ui/capture.h"
#include "filter_files.h" #include "ui/filter_files.h"
#include "ui/capture_globals.h" #include "ui/capture_globals.h"
#include "ui/software_update.h" #include "ui/software_update.h"
#include "ui/last_open_dir.h" #include "ui/last_open_dir.h"