From Harald Welte:

[obnox/wireshark/wip.git] / summary.c

diff --git a/summary.c b/summary.c
index 36a59e0e304169dfaf3a3291d0191c375e470537..21b91c29f60b1ca4fef18f80c86174a585a997f3 100644 (file)
--- a/summary.c
+++ b/summary.c
@@ -109,12 +109,12 @@ summary_fill_in(capture_file *cf, summary_tally *st)
 
   /* initialize the tally */
   if (cf->count != 0) {
-    first_frame = cap_file_find_fdata(cf, 1);
+    first_frame = frame_data_sequence_find(cf->frames, 1);
     st->start_time = nstime_to_sec(&first_frame->abs_ts);
     st->stop_time = nstime_to_sec(&first_frame->abs_ts);
 
     for (framenum = 1; framenum <= cf->count; framenum++) {
-      cur_frame = cap_file_find_fdata(cf, framenum);
+      cur_frame = frame_data_sequence_find(cf->frames, framenum);
       tally_frame_data(cur_frame, st);
     }
   }
@@ -122,6 +122,7 @@ summary_fill_in(capture_file *cf, summary_tally *st)
   st->filename = cf->filename;
   st->file_length = cf->f_datalen;
   st->file_type = cf->cd_t;
+  st->is_tempfile = cf->is_tempfile;
   st->encap_type = cf->lnk_t;
   st->has_snap = cf->has_snap;
   st->snap = cf->snap;
@@ -131,10 +132,7 @@ summary_fill_in(capture_file *cf, summary_tally *st)
   st->drops = cf->drops;
   st->dfilter = cf->dfilter;
 
-  /* capture related */
-  st->cfilter = NULL;
-  st->iface = NULL;
-  st->iface_descr = NULL;
+  st->ifaces  = g_array_new(FALSE, FALSE, sizeof(iface_options));
 }
 
 
@@ -142,8 +140,30 @@ summary_fill_in(capture_file *cf, summary_tally *st)
 void
 summary_fill_in_capture(capture_options *capture_opts, summary_tally *st)
 {
-  st->cfilter = capture_opts->cfilter;
-  st->iface = capture_opts->iface;
-  st->iface_descr = get_iface_description(capture_opts);
+  iface_options iface;
+  interface_options interface_opts;
+  guint i;
+
+  while (st->ifaces->len > 0) {
+    iface = g_array_index(st->ifaces, iface_options, 0);
+    st->ifaces = g_array_remove_index(st->ifaces, 0);
+    g_free(iface.name);
+    g_free(iface.descr);
+    g_free(iface.cfilter);
+  }
+  if (st->is_tempfile) {
+    for (i = 0; i < capture_opts->ifaces->len; i++) {
+      interface_opts = g_array_index(capture_opts->ifaces, interface_options, i);
+      iface.cfilter = g_strdup(interface_opts.cfilter);
+      iface.name = g_strdup(interface_opts.name);
+      iface.descr = g_strdup(interface_opts.descr);
+      iface.drops_known = FALSE;
+      iface.drops = 0;
+      iface.has_snap = interface_opts.has_snaplen;
+      iface.snap = interface_opts.snaplen;
+      iface.linktype = interface_opts.linktype;
+      g_array_append_val(st->ifaces, iface);
+    }
+  }
 }
 #endif