macos-setup.sh: fix Python 3 installation for OS X 10.8 and older

[metze/wireshark/wip.git] / capture_info.h

diff --git a/capture_info.h b/capture_info.h
index 46bd72aade12c8785c9aa27e6e484008ceb96227..09ab8f4d615bc0aca17fb6ba451c7f22825e2252 100644 (file)
--- a/capture_info.h
+++ b/capture_info.h
@@ -5,25 +5,13 @@
  * 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
  */
 
 
 /** @file
  *
- * capture info functions
+ * Capture info functions.
  *
  */
 
@@ -32,36 +20,30 @@
 
 #include "capture_opts.h"
 #include <capchild/capture_session.h>
+#include <epan/capture_dissectors.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-/* open the info - init values (wtap, counts), create dialog */
-extern void capture_info_open(capture_session *cap_session);
-
-/* new file arrived - (eventually close old wtap), open wtap */
-extern gboolean capture_info_new_file(const char *new_filename);
-
-/* new packets arrived - read from wtap, count */
-extern void capture_info_new_packets(int to_read);
-
-/* close the info - close wtap, destroy dialog */
-extern void capture_info_close(void);
-
-
-
 /** Current Capture info. */
-typedef struct {
+typedef struct _capture_info {
     /* handle */
     gpointer        ui;             /**< user interface handle */
 
     /* capture info */
     packet_counts   *counts;        /**< protocol specific counters */
-    time_t          running_time;   /**< running time since last update */
     gint            new_packets;    /**< packets since last update */
 } capture_info;
 
+typedef struct _info_data {
+    packet_counts     counts;     /* Packet counting */
+    struct wtap*      wtap;       /* current wtap file */
+    capture_info      ui;         /* user interface data */
+} info_data_t;
+
+/* new packets arrived - read from wtap, count */
+extern void capture_info_new_packets(int to_read, info_data_t* cap_info);
 
 /** Create the capture info dialog */
 extern void