Allow "capture info data" to not be a singleton.

[metze/wireshark/wip.git] / ui / capture.c

diff --git a/ui/capture.c b/ui/capture.c
index f553fa8975a6b9aac856e37d82021fdc34f5634f..f3818a6ef844f3a1b28a19c798c40d18921f20a4 100644 (file)
--- a/ui/capture.c
+++ b/ui/capture.c
@@ -24,10 +24,6 @@
 
 #ifdef HAVE_LIBPCAP
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -54,6 +50,7 @@
 #include "ui/ui_util.h"
 
 #include "wsutil/file_util.h"
+#include "wsutil/str_util.h"
 #include "log.h"
 
 typedef struct if_stat_cache_item_s {
@@ -129,7 +126,7 @@ capture_callback_remove(capture_callback_t func, gpointer user_data)
  * @return TRUE if the capture starts successfully, FALSE otherwise.
  */
 gboolean
-capture_start(capture_options *capture_opts, capture_session *cap_session, void(*update_cb)(void))
+capture_start(capture_options *capture_opts, capture_session *cap_session, info_data_t* cap_data, void(*update_cb)(void))
 {
   gboolean ret;
   GString *source;
@@ -141,7 +138,7 @@ capture_start(capture_options *capture_opts, capture_session *cap_session, void(
   cf_set_tempfile_source((capture_file *)cap_session->cf, source->str);
   g_string_free(source, TRUE);
   /* try to start the capture child process */
-  ret = sync_pipe_start(capture_opts, cap_session, update_cb);
+  ret = sync_pipe_start(capture_opts, cap_session, cap_data, update_cb);
   if(!ret) {
       if(capture_opts->save_file != NULL) {
           g_free(capture_opts->save_file);
@@ -159,7 +156,7 @@ capture_start(capture_options *capture_opts, capture_session *cap_session, void(
       capture_callback_invoke(capture_cb_capture_prepared, cap_session);
 
       if(capture_opts->show_info)
-        capture_info_open(cap_session);
+        capture_info_open(cap_session, cap_data);
   }
 
   return ret;
@@ -349,7 +346,7 @@ capture_input_new_file(capture_session *cap_session, gchar *new_file)
   }
 
   if(capture_opts->show_info) {
-    if (!capture_info_new_file(new_file))
+    if (!capture_info_new_file(new_file, cap_session->cap_data_info))
       return FALSE;
   }
 
@@ -406,7 +403,7 @@ capture_input_new_packets(capture_session *cap_session, int to_read)
 #endif
 
   if(capture_opts->show_info)
-    capture_info_new_packets(to_read);
+    capture_info_new_packets(to_read, cap_session->cap_data_info);
 }
 
 
@@ -597,7 +594,7 @@ capture_input_closed(capture_session *cap_session, gchar *msg)
   }
 
   if(capture_opts->show_info)
-    capture_info_close();
+    capture_info_close(cap_session->cap_data_info);
 
   cap_session->state = CAPTURE_STOPPED;
 
@@ -634,7 +631,7 @@ capture_input_closed(capture_session *cap_session, gchar *msg)
     /* close the currently loaded capture file */
     cf_close((capture_file *)cap_session->cf);
 
-    capture_start(capture_opts, cap_session,NULL); /*XXX is this NULL ok or we need an update_cb???*/
+    capture_start(capture_opts, cap_session, cap_session->cap_data_info, NULL); /*XXX is this NULL ok or we need an update_cb???*/
   } else {
     /* We're not doing a capture any more, so we don't have a save file. */
     g_free(capture_opts->save_file);