dpa400: Fix wiretap data packet len

[metze/wireshark/wip.git] / capchild / capture_session.h

diff --git a/capchild/capture_session.h b/capchild/capture_session.h
index e21d182fe325168f5444195c4740c4c50bad16d8..111257d467349572d2654b0617a0be0f5b9f6054 100644 (file)
--- a/capchild/capture_session.h
+++ b/capchild/capture_session.h
@@ -5,19 +5,7 @@
  * 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.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __CAPCHILD_CAPTURE_SESSION_H__
@@ -34,6 +22,8 @@ extern "C" {
 
 #include "capture_opts.h"
 
+#include <wsutil/processes.h>
+
 #ifdef HAVE_LIBPCAP
 /* Current state of capture engine. XXX - differentiate states */
 typedef enum {
@@ -42,30 +32,31 @@ typedef enum {
     CAPTURE_RUNNING         /**< capture child signalled ok, capture is running now */
 } capture_state;
 
-struct _capture_file;
-
+#include "cfile.h"
+struct _info_data;
 /*
  * State of a capture session.
  */
 typedef struct _capture_session {
-       intptr_t  fork_child;                 /**< If not -1, in parent, process ID of child */
+    ws_process_id fork_child;             /**< If not WS_INVALID_PID, 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 */
+    capture_state state;                  /**< current state of the capture engine */
 #ifndef _WIN32
-              uid_t owner;                /**< owner of the cfile */
+    uid_t     owner;                      /**< owner of the cfile */
     gid_t     group;                      /**< group of the cfile */
 #endif
     gboolean  session_started;
     guint32   count;                      /**< Total number of frames captured */
     capture_options *capture_opts;        /**< options for this capture */
-    struct    _capture_file *cf;          /**< handle to cfile */
+    capture_file *cf;                     /**< handle to cfile */
+    struct _info_data *cap_data_info;          /**< stats for this capture */
 } capture_session;
 
 extern void
-capture_session_init(capture_session *cap_session, struct _capture_file *cf);
+capture_session_init(capture_session *cap_session, capture_file *cf);
 #else
 
 /* dummy is needed because clang throws the error: empty struct has size 0 in C, size 1 in C++ */