extcap: check that argument parameter is not null before adding it to command line

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

diff --git a/capture_info.h b/capture_info.h
index cbd13336c02e1cf539e292822541cb209373b1e9..fc9f52c4f2caf43bb85ca7814d85c862009bcb12 100644 (file)
--- a/capture_info.h
+++ b/capture_info.h
@@ -23,34 +23,27 @@
 
 /** @file
  *
- * capture info functions
+ * Capture info functions.
  *
  */
 
+/*
+ * GTK+ only.
+ * If we add this to the Qt UI we should modernize the statistics we show.
+ * At the very least we should remove or hide IPX and VINES.
+ */
+
 #ifndef __CAPTURE_INFO_H__
 #define __CAPTURE_INFO_H__
 
 #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 {
     /* handle */
@@ -62,6 +55,23 @@ typedef struct {
     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;
+
+/* open the info - init values (wtap, counts), create dialog */
+extern void capture_info_open(capture_session *cap_session, info_data_t* cap_info);
+
+/* new file arrived - (eventually close old wtap), open wtap */
+extern gboolean capture_info_new_file(const char *new_filename, info_data_t* cap_info);
+
+/* new packets arrived - read from wtap, count */
+extern void capture_info_new_packets(int to_read, info_data_t* cap_info);
+
+/* close the info - close wtap, destroy dialog */
+extern void capture_info_close(info_data_t* cap_info);
 
 /** Create the capture info dialog */
 extern void
@@ -79,6 +89,8 @@ capture_info    *cinfo);
 }
 #endif /* __cplusplus */
 
+#endif /* capture_info.h */
+
 /*
  * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
  *
@@ -91,5 +103,3 @@ capture_info    *cinfo);
  * vi: set shiftwidth=4 tabstop=8 expandtab:
  * :indentSize=4:tabSize=8:noTabs=true:
  */
-
-#endif /* capture_info.h */