diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-06-29 22:08:59 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-06-30 05:09:31 +0000 |
commit | b33512b704eae1716939cd493ecac85998039f07 (patch) | |
tree | 1b9f0aedd7ba3b73bd3e66cc4c06f19d63b50b7b /capchild | |
parent | df5833723c41003486eba83aaf6ca41f0c27816b (diff) |
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>
Diffstat (limited to 'capchild')
-rw-r--r-- | capchild/Makefile.common | 1 | ||||
-rw-r--r-- | capchild/capture_ifinfo.c | 2 | ||||
-rw-r--r-- | capchild/capture_session.h | 70 |
3 files changed, 72 insertions, 1 deletions
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/capchild/capture_session.h b/capchild/capture_session.h new file mode 100644 index 0000000000..6189590b0d --- /dev/null +++ b/capchild/capture_session.h @@ -0,0 +1,70 @@ +/* capture_session.h + * State of a capture session + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef __CAPCHILD_CAPTURE_SESSION_H__ +#define __CAPCHILD_CAPTURE_SESSION_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +#ifdef HAVE_LIBPCAP +/* Current state of capture engine. XXX - differentiate states */ +typedef enum { + CAPTURE_STOPPED, /**< stopped */ + CAPTURE_PREPARING, /**< preparing, but still no response from capture child */ + CAPTURE_RUNNING /**< capture child signalled ok, capture is running now */ +} capture_state; + +/* + * State of a capture session. + */ +typedef struct { + int fork_child; /**< If not -1, in parent, process ID of child */ + int fork_child_status; /**< Child exit status */ +#ifdef _WIN32 + int signal_pipe_write_fd; /**< the pipe to signal the child */ +#endif + capture_state state; /**< current state of the capture engine */ +#ifndef _WIN32 + uid_t owner; /**< owner of the cfile */ + gid_t group; /**< group of the cfile */ +#endif + gboolean session_started; + capture_options *capture_opts; /**< options for this capture */ + void *cf; /**< handle to cfile (note: untyped handle) */ +} capture_session; + +extern void +capture_session_init(capture_session *cap_session, void *cf); +#else + +/* 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; + +#endif /* HAVE_LIBPCAP */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __CAPCHILD_CAPTURE_SESSION_H__ */ |