From Harald Welte:

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

diff --git a/summary.c b/summary.c
index b21706c6be82d2db28257ce695545ad2231430d4..21b91c29f60b1ca4fef18f80c86174a585a997f3 100644 (file)
--- a/summary.c
+++ b/summary.c
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -26,6 +26,10 @@
 # include "config.h"
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
 #include <epan/packet.h>
 #include "cfile.h"
 #include "summary.h"
@@ -54,7 +58,7 @@ tally_frame_data(frame_data *cur_frame, summary_tally *sum_tally)
            sum_tally->filtered_stop = cur_time;
     } else {
            if (cur_time < sum_tally->filtered_start) {
-                   sum_tally->start_time = cur_time;
+                   sum_tally->filtered_start = cur_time;
            }
            if (cur_time > sum_tally->filtered_stop) {
                    sum_tally->filtered_stop = cur_time;
@@ -63,9 +67,24 @@ tally_frame_data(frame_data *cur_frame, summary_tally *sum_tally)
     sum_tally->filtered_count++;
     sum_tally->filtered_bytes += cur_frame->pkt_len ;
   }
-  if (cur_frame->flags.marked)
+  if (cur_frame->flags.marked){
+    if (sum_tally->marked_count==0){
+           sum_tally->marked_start= cur_time;
+           sum_tally->marked_stop = cur_time;
+    } else {
+           if (cur_time < sum_tally->marked_start) {
+                   sum_tally->marked_start = cur_time;
+           }
+           if (cur_time > sum_tally->marked_stop) {
+                   sum_tally->marked_stop = cur_time;
+           }
+    }
     sum_tally->marked_count++;
-
+    sum_tally->marked_bytes += cur_frame->pkt_len ;
+  }
+  if (cur_frame->flags.ignored){
+    sum_tally->ignored_count++;
+  }
 }
 
 void
@@ -73,35 +92,38 @@ summary_fill_in(capture_file *cf, summary_tally *st)
 {
 
   frame_data    *first_frame, *cur_frame;
-  int          i;
-  frame_data    *cur_glist;
+  guint32        framenum;
 
   st->start_time = 0;
   st->stop_time = 0;
   st->bytes = 0;
   st->filtered_count = 0;
   st->filtered_start = 0;
-  st->filtered_stop   = 0;
+  st->filtered_stop = 0;
   st->filtered_bytes = 0;
   st->marked_count = 0;
+  st->marked_start = 0;
+  st->marked_stop = 0;
+  st->marked_bytes = 0;
+  st->ignored_count = 0;
 
   /* initialize the tally */
-  if (cf->plist != NULL) {
-    first_frame = cf->plist;
-    st->start_time     = nstime_to_sec(&first_frame->abs_ts);
+  if (cf->count != 0) {
+    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);
-    cur_glist = cf->plist;
 
-    for (i = 0; i < cf->count; i++) {
-      cur_frame = cur_glist;
+    for (framenum = 1; framenum <= cf->count; framenum++) {
+      cur_frame = frame_data_sequence_find(cf->frames, framenum);
       tally_frame_data(cur_frame, st);
-      cur_glist = cur_glist->next;
     }
   }
 
   st->filename = cf->filename;
   st->file_length = cf->f_datalen;
-  st->encap_type = cf->cd_t;
+  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;
   st->elapsed_time = nstime_to_sec(&cf->elapsed_time);
@@ -110,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));
 }
 
 
@@ -121,12 +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;
-  if(st->iface) {
-    st->iface_descr = get_interface_descriptive_name(st->iface);
-  } else {
-    st->iface_descr = NULL;
+  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