Move capture_session.h to capchild; what it declares is defined there.

Change-Id: I8b1407839390b7ac0b45bf6f583c1a509073f002
Reviewed-on: https://code.wireshark.org/review/2709
Reviewed-by: Guy Harris <guy@alum.mit.edu>

16 files changed, 17 insertions, 27 deletions

diff --git a/Makefile.common b/Makefile.common
index 9f97930338..f8e65a3426 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -62,18 +62,9 @@ SHARK_COMMON_INCLUDES =	\
 	version_info.h		\
 	ws_symbol_export.h
 
-# sources common for wireshark and tshark, but not rawshark;
-# these are for programs that capture traffic by running dumpcap
-SHARK_COMMON_CAPTURE_SRC =
-
-# corresponding headers
-SHARK_COMMON_CAPTURE_INCLUDES =	\
-	capture_session.h
-
 # wireshark specifics
 WIRESHARK_COMMON_SRC =	\
 	$(SHARK_COMMON_SRC)	\
-	$(SHARK_COMMON_CAPTURE_SRC) \
 	airpcap_loader.c \
 	capture.c	\
 	capture_info.c	\
@@ -108,7 +99,6 @@ WIRESHARK_COMMON_INCLUDES =	\
 # tshark specifics
 tshark_SOURCES =	\
 	$(SHARK_COMMON_SRC)	\
-	$(SHARK_COMMON_CAPTURE_SRC) \
 	capture_opts.c		\
 	tshark.c
 
@@ -185,6 +175,5 @@ dumpcap_INCLUDES = \
 # this target needed for distribution only
 noinst_HEADERS =	\
 	$(SHARK_COMMON_INCLUDES) \
-	$(SHARK_COMMON_CAPTURE_INCLUDES) \
 	$(WIRESHARK_COMMON_INCLUDES) \
 	$(dumpcap_INCLUDES)
diff --git a/capchild/Makefile.common b/capchild/Makefile.common
index 80a8b9adaa..740898299c 100644
--- a/capchild/Makefile.common
+++ b/capchild/Makefile.common
@@ -27,4 +27,5 @@ CAPCHILD_SRC = \
 
 noinst_HEADERS = \
 	capture_ifinfo.h	\
+	capture_session.h	\
 	capture_sync.h
diff --git a/capchild/capture_ifinfo.c b/capchild/capture_ifinfo.c
index 4b36e46b02..3d758c2f67 100644
--- a/capchild/capture_ifinfo.c
+++ b/capchild/capture_ifinfo.c
@@ -47,7 +47,7 @@
 #include <glib.h>
 
 #include "capture_opts.h"
-#include "capture_session.h"
+#include <capchild/capture_session.h>
 #include <capchild/capture_sync.h>
 #include "log.h"
 
diff --git a/capture_session.h b/capchild/capture_session.h
index 0a9485e8d8..6189590b0d 100644
--- a/capture_session.h
+++ b/capchild/capture_session.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef __CAPTURE_SESSION_H__
-#define __CAPTURE_SESSION_H__
+#ifndef __CAPCHILD_CAPTURE_SESSION_H__
+#define __CAPCHILD_CAPTURE_SESSION_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,4 +67,4 @@ typedef struct {int dummy;} capture_session;
 }
 #endif /* __cplusplus */
 
-#endif /* __CAPTURE_SESSION_H__ */
+#endif /* __CAPCHILD_CAPTURE_SESSION_H__ */
diff --git a/capture.h b/capture.h
index 31d2d30d4d..6aaa5035be 100644
--- a/capture.h
+++ b/capture.h
@@ -30,7 +30,7 @@
  */
 
 #include "capture_opts.h"
-#include "capture_session.h"
+#include <capchild/capture_session.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/capture_info.h b/capture_info.h
index 3e5845ac6c..6b92d70704 100644
--- a/capture_info.h
+++ b/capture_info.h
@@ -31,7 +31,7 @@
 #define __CAPTURE_INFO_H__
 
 #include "capture_opts.h"
-#include "capture_session.h"
+#include <capchild/capture_session.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/dumpcap.c b/dumpcap.c
index 0c91b7341b..b4028fd04e 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -118,7 +118,7 @@
 #include "sync_pipe.h"
 
 #include "capture_opts.h"
-#include "capture_session.h"
+#include <capchild/capture_session.h>
 #include <capchild/capture_ifinfo.h>
 #include <capchild/capture_sync.h>
 
diff --git a/echld/echld-int.h b/echld/echld-int.h
index aaaca979b2..f433f883fd 100644
--- a/echld/echld-int.h
+++ b/echld/echld-int.h
@@ -61,7 +61,7 @@
 
 
 #include "capture_opts.h"
-#include "capture_session.h"
+#include <capchild/capture_session.h>
 #include <capchild/capture_ifinfo.h>
 #include <capchild/capture_sync.h>
 #include "version_info.h"
diff --git a/tshark.c b/tshark.c
index 4ad15a57a7..5e5641dbca 100644
--- a/tshark.c
+++ b/tshark.c
@@ -111,7 +111,7 @@
 #include "capture-wpcap.h"
 #include <wsutil/unicode-utils.h>
 #endif /* _WIN32 */
-#include "capture_session.h"
+#include <capchild/capture_session.h>
 #include <capchild/capture_sync.h>
 #include "capture_opts.h"
 #endif /* HAVE_LIBPCAP */
diff --git a/ui/capture_globals.h b/ui/capture_globals.h
index 51c81aa212..d7b9e77542 100644
--- a/ui/capture_globals.h
+++ b/ui/capture_globals.h
@@ -23,7 +23,7 @@
 #ifndef __CAPTURE_GLOBALS_H__
 #define __CAPTURE_GLOBALS_H__
 
-#include "../capture_session.h"
+#include <capchild/capture_session.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ui/gtk/capture_if_dlg.c b/ui/gtk/capture_if_dlg.c
index 5d9302d812..3a6dc27d58 100644
--- a/ui/gtk/capture_if_dlg.c
+++ b/ui/gtk/capture_if_dlg.c
@@ -32,7 +32,7 @@
 #include <epan/to_str.h>
 
 #include "../capture_opts.h"
-#include "../capture_session.h"
+#include <capchild/capture_session.h>
 #include <capchild/capture_ifinfo.h>
 #include "../capture.h"
 #include "../capture-pcap-util.h"
diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c
index df11100cb2..212c9ffbb4 100644
--- a/ui/gtk/main_80211_toolbar.c
+++ b/ui/gtk/main_80211_toolbar.c
@@ -46,7 +46,7 @@
 #include "ui/gtk/main_80211_toolbar.h"
 
 #include "ws80211_utils.h"
-#include "capture_session.h"
+#include <capchild/capture_session.h>
 #include <capchild/capture_sync.h>
 
 static GtkWidget *tb80211_tb, *tb80211_iface_list_box, *tb80211_freq_list_box, *tb80211_chan_type_box, *tb80211_info_label;
diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c
index 8cdfc18f36..9afaac5199 100644
--- a/ui/gtk/main_statusbar.c
+++ b/ui/gtk/main_statusbar.c
@@ -38,7 +38,7 @@
 #include "../file.h"
 #ifdef HAVE_LIBPCAP
 #include "../capture_opts.h"
-#include "../capture_session.h"
+#include <capchild/capture_session.h>
 #include "../capture.h"
 #endif
 
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index ca87034192..68f45fdfea 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -33,7 +33,7 @@
 #ifdef HAVE_LIBPCAP
 #include "capture.h"
 #include "capture-pcap-util.h"
-#include "capture_session.h"
+#include <capchild/capture_session.h>
 #endif
 
 #include "ui/alert_box.h"
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index 916bbe7d2b..8219c3425a 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -37,7 +37,7 @@
 #ifdef HAVE_LIBPCAP
 #include "capture_opts.h"
 #endif
-#include "capture_session.h"
+#include <capchild/capture_session.h>
 
 #include <QMainWindow>
 #include <QSplitter>
diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h
index 2403555894..0c78055982 100644
--- a/ui/qt/wireshark_application.h
+++ b/ui/qt/wireshark_application.h
@@ -29,7 +29,7 @@
 #include "epan/prefs.h"
 
 #include "capture_opts.h"
-#include "capture_session.h"
+#include <capchild/capture_session.h>
 #include "file.h"
 #include "register.h"