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

Move capture.[ch] to libui. 

Change-Id: I86e7e781cc9e14abab0374a18b95438529b046f0
Reviewed-on: https://code.wireshark.org/review/2711
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-06-29 22:38:29 -07:00
parent 7d1a93f7fd
commit ad1391aa4e
24 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -1032,7 +1032,6 @@ set(LIBEPAN_LIBS
if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) ) if( (BUILD_wireshark AND GTK_FOUND) OR (BUILD_qtshark AND QT_FOUND) )
set(wireshark_FILES set(wireshark_FILES
airpcap_loader.c airpcap_loader.c
capture.c
capture_info.c capture_info.c
capture_opts.c capture_opts.c
color_filters.c color_filters.c

2
Makefile.common
View File

@ -66,7 +66,6 @@ SHARK_COMMON_INCLUDES = \
WIRESHARK_COMMON_SRC = \ WIRESHARK_COMMON_SRC = \
$(SHARK_COMMON_SRC) \ $(SHARK_COMMON_SRC) \
airpcap_loader.c \ airpcap_loader.c \
capture.c \
capture_info.c \ capture_info.c \
capture_opts.c \ capture_opts.c \
color_filters.c \ color_filters.c \
@ -82,7 +81,6 @@ WIRESHARK_COMMON_SRC = \
WIRESHARK_COMMON_INCLUDES = \ WIRESHARK_COMMON_INCLUDES = \
airpcap.h \ airpcap.h \
airpcap_loader.h \ airpcap_loader.h \
capture.h \
capture_info.h \ capture_info.h \
capture_opts.h \ capture_opts.h \
color_filters.h \ color_filters.h \

2
capchild/capture_sync.c
View File

@ -84,7 +84,7 @@
#include "globals.h" #include "globals.h"
#include "file.h" #include "file.h"
#include "capture.h" #include "ui/capture.h"
#include <capchild/capture_sync.h> #include <capchild/capture_sync.h>
#include "sync_pipe.h" #include "sync_pipe.h"

2
summary.h
View File

@ -24,7 +24,7 @@
#define __SUMMARY_H__ #define __SUMMARY_H__
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "capture.h" #include "ui/capture.h"
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

1
ui/CMakeLists.txt
View File

@ -22,6 +22,7 @@
set(COMMON_UI_SRC set(COMMON_UI_SRC
alert_box.c alert_box.c
capture.c
capture_ui_utils.c capture_ui_utils.c
decode_as_utils.c decode_as_utils.c
export_object.c export_object.c

2
ui/Makefile.common
View File

@ -43,6 +43,7 @@ GENERATOR_FILES = \
WIRESHARK_UI_SRC = \ WIRESHARK_UI_SRC = \
alert_box.c \ alert_box.c \
capture.c \
capture_ui_utils.c \ capture_ui_utils.c \
decode_as_utils.c \ decode_as_utils.c \
export_object.c \ export_object.c \
@ -73,6 +74,7 @@ WIRESHARK_UI_SRC = \
noinst_HEADERS = \ noinst_HEADERS = \
alert_box.h \ alert_box.h \
capture.h \
capture_globals.h \ capture_globals.h \
capture_ui_utils.h \ capture_ui_utils.h \
decode_as_utils.h \ decode_as_utils.h \

2
capture.c → ui/capture.c
View File

@ -37,7 +37,7 @@
#include <epan/packet.h> #include <epan/packet.h>
#include <epan/dfilter/dfilter.h> #include <epan/dfilter/dfilter.h>
#include "file.h" #include "file.h"
#include "capture.h" #include "ui/capture.h"
#include <capchild/capture_ifinfo.h> #include <capchild/capture_ifinfo.h>
#include <capchild/capture_sync.h> #include <capchild/capture_sync.h>
#include "capture_info.h" #include "capture_info.h"

0
capture.h → ui/capture.h
View File

2
ui/gtk/capture_dlg.c
View File

@ -36,7 +36,7 @@
#include <epan/prefs.h> #include <epan/prefs.h>
#include <wsutil/filesystem.h> #include <wsutil/filesystem.h>
#include "../capture.h" #include "ui/capture.h"
#include <capchild/capture_ifinfo.h> #include <capchild/capture_ifinfo.h>
#include "../capture-pcap-util.h" #include "../capture-pcap-util.h"
#include "../ringbuffer.h" #include "../ringbuffer.h"

2
ui/gtk/capture_if_details_dlg_win32.c
View File

@ -36,7 +36,7 @@
#include <wsutil/str_util.h> #include <wsutil/str_util.h>
#include "../file.h" #include "../file.h"
#include "../capture.h" #include "ui/capture.h"
#include "ui/simple_dialog.h" #include "ui/simple_dialog.h"

2
ui/gtk/capture_if_dlg.c
View File

@ -34,7 +34,7 @@
#include "../capture_opts.h" #include "../capture_opts.h"
#include <capchild/capture_session.h> #include <capchild/capture_session.h>
#include <capchild/capture_ifinfo.h> #include <capchild/capture_ifinfo.h>
#include "../capture.h" #include "ui/capture.h"
#include "../capture-pcap-util.h" #include "../capture-pcap-util.h"
#include "wsutil/file_util.h" #include "wsutil/file_util.h"
#include <wiretap/wtap.h> #include <wiretap/wtap.h>

2
ui/gtk/capture_info_dlg.c
View File

@ -30,7 +30,7 @@
#include <epan/packet.h> #include <epan/packet.h>
#include "../capture.h" #include "ui/capture.h"
#include "../capture_info.h" #include "../capture_info.h"
#include "../capture-pcap-util.h" #include "../capture-pcap-util.h"

2
ui/gtk/drag_and_drop.c
View File

@ -32,7 +32,7 @@
#include "ui/util.h" #include "ui/util.h"
#include "../file.h" #include "../file.h"
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "../capture.h" #include "ui/capture.h"
#endif #endif
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP

2
ui/gtk/main.c
View File

@ -133,7 +133,7 @@
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "capture-pcap-util.h" #include "capture-pcap-util.h"
#include <capchild/capture_ifinfo.h> #include <capchild/capture_ifinfo.h>
#include "capture.h" #include "ui/capture.h"
#include <capchild/capture_sync.h> #include <capchild/capture_sync.h>
#endif #endif

2
ui/gtk/main_statusbar.c
View File

@ -39,7 +39,7 @@
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "../capture_opts.h" #include "../capture_opts.h"
#include <capchild/capture_session.h> #include <capchild/capture_session.h>
#include "../capture.h" #include "ui/capture.h"
#endif #endif
#include <wsutil/str_util.h> #include <wsutil/str_util.h>

2
ui/gtk/main_welcome.c
View File

@ -29,7 +29,7 @@
#include "../color.h" #include "../color.h"
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "capture.h" #include "ui/capture.h"
#include "capture-pcap-util.h" #include "capture-pcap-util.h"
#include "capture_opts.h" #include "capture_opts.h"
#endif #endif

2
ui/gtk/summary_dlg.c
View File

@ -39,7 +39,7 @@
#include "../capture-pcap-util.h" #include "../capture-pcap-util.h"
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "../capture.h" #include "ui/capture.h"
#include "ui/capture_globals.h" #include "ui/capture_globals.h"
#endif #endif
#include "ui/main_statusbar.h" #include "ui/main_statusbar.h"

1
ui/qt/QtShark.pro
View File

@ -188,7 +188,6 @@ win32:INCLUDEPATH += \
SOURCES_WS_C = \ SOURCES_WS_C = \
../../airpcap_loader.c \ ../../airpcap_loader.c \
../../capture-pcap-util.c \ ../../capture-pcap-util.c \
../../capture.c \
../../capture_info.c \ ../../capture_info.c \
../../capture_opts.c \ ../../capture_opts.c \
../../cfile.c \ ../../cfile.c \

2
ui/qt/interface_tree.h
View File

@ -27,7 +27,7 @@
#include <glib.h> #include <glib.h>
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "capture.h" #include "ui/capture.h"
#include "capture-pcap-util.h" #include "capture-pcap-util.h"
#include "capture_opts.h" #include "capture_opts.h"
#include "ui/capture_ui_utils.h" #include "ui/capture_ui_utils.h"

2
ui/qt/main.cpp
View File

@ -108,7 +108,7 @@
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
# include "capture-pcap-util.h" # include "capture-pcap-util.h"
# include <capchild/capture_ifinfo.h> # include <capchild/capture_ifinfo.h>
# include "capture.h" # include "ui/capture.h"
# include <capchild/capture_sync.h> # include <capchild/capture_sync.h>
#endif #endif

2
ui/qt/main_window.cpp
View File

@ -31,7 +31,7 @@
//#include <wiretap/wtap.h> //#include <wiretap/wtap.h>
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "capture.h" #include "ui/capture.h"
#include "capture-pcap-util.h" #include "capture-pcap-util.h"
#include <capchild/capture_session.h> #include <capchild/capture_session.h>
#endif #endif

2
ui/qt/main_window_slots.cpp
View File

@ -43,7 +43,7 @@
#endif #endif
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "capture.h" #include "ui/capture.h"
#include "capture-pcap-util.h" #include "capture-pcap-util.h"
#endif #endif

2
ui/qt/summary_dialog.h
View File

@ -39,7 +39,7 @@
#include "summary.h" #include "summary.h"
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
#include "capture.h" #include "ui/capture.h"
#include "ui/capture_globals.h" #include "ui/capture_globals.h"
#include "capture-pcap-util.h" #include "capture-pcap-util.h"
#endif #endif

2
ui/qt/wireshark_application.cpp
View File

@ -35,7 +35,7 @@
#include "qt_ui_utils.h" #include "qt_ui_utils.h"
#include "capture.h" #include "ui/capture.h"
#include "color_filters.h" #include "color_filters.h"
#include "filters.h" #include "filters.h"
#include "log.h" #include "log.h"