path: root/capchild/capture_session.h
diff options
authorGerald Combs <gerald@wireshark.org>2014-09-09 16:42:58 -0400
committerGerald Combs <gerald@wireshark.org>2014-12-20 17:39:29 +0000
commit9ba9cd83a4f72339b15aebbc1fbdde32f08ef3bc (patch)
tree4ed17ac7d9681f43bf1e0e1069bb2a84a48a8387 /capchild/capture_session.h
parent2bb8255e29e26c7c14f7a83ce33b41f9af18501e (diff)
Qt: Add a CaptureFile class.
Wrap the capture_file struct in a QObject which translates cf_cb_* and capture_cb_* events into signals. Move the global cfile to capture_file.cpp. Don't use a void pointer for the capture file struct. Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a Reviewed-on: https://code.wireshark.org/review/5885 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'capchild/capture_session.h')
1 files changed, 6 insertions, 4 deletions
diff --git a/capchild/capture_session.h b/capchild/capture_session.h
index 951b51e499..06cfb88902 100644
--- a/capchild/capture_session.h
+++ b/capchild/capture_session.h
@@ -41,10 +41,12 @@ typedef enum {
CAPTURE_RUNNING /**< capture child signalled ok, capture is running now */
} capture_state;
+struct _capture_file;
* State of a capture session.
-typedef struct {
+typedef struct _capture_session {
int fork_child; /**< If not -1, in parent, process ID of child */
int fork_child_status; /**< Child exit status */
#ifdef _WIN32
@@ -57,15 +59,15 @@ typedef struct {
gboolean session_started;
capture_options *capture_opts; /**< options for this capture */
- void *cf; /**< handle to cfile (note: untyped handle) */
+ struct _capture_file *cf; /**< handle to cfile */
} capture_session;
extern void
-capture_session_init(capture_session *cap_session, void *cf);
+capture_session_init(capture_session *cap_session, struct _capture_file *cf);
/* dummy is needed because clang throws the error: empty struct has size 0 in C, size 1 in C++ */
-typedef struct {int dummy;} capture_session;
+typedef struct _capture_session {int dummy;} capture_session;
#endif /* HAVE_LIBPCAP */