http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=377

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

diff --git a/summary.c b/summary.c
index 68dc50a3a3ea260b58ae161d7f627aa3a8d3227d..b21706c6be82d2db28257ce695545ad2231430d4 100644 (file)
--- a/summary.c
+++ b/summary.c
@@ -1,13 +1,12 @@
 /* summary.c
  * Routines for capture file summary info
  *
- * $Id: summary.c,v 1.15 1999/12/10 04:20:53 gram Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * 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
@@ -23,78 +22,111 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include "packet.h"
-#include "globals.h"
+#include <epan/packet.h>
+#include "cfile.h"
 #include "summary.h"
+#ifdef HAVE_LIBPCAP
+#include "capture_ui_utils.h"
+#endif
 
 
-static double
-secs_usecs( guint32 s, guint32 us)
-{
-  return (us / 1000000.0) + (double)s;
-}
-
 static void
 tally_frame_data(frame_data *cur_frame, summary_tally *sum_tally)
 {
   double cur_time;
 
-  cur_time = secs_usecs(cur_frame->abs_secs, cur_frame->abs_usecs);
+  cur_time = nstime_to_sec(&cur_frame->abs_ts);
 
-    if (cur_time < sum_tally->start_time) {
-      sum_tally->start_time = cur_time;
-    }
-    if (cur_time > sum_tally->stop_time){
-      sum_tally->stop_time = cur_time;
+  if (cur_time < sum_tally->start_time) {
+    sum_tally->start_time = cur_time;
+  }
+  if (cur_time > sum_tally->stop_time){
+    sum_tally->stop_time = cur_time;
+  }
+  sum_tally->bytes += cur_frame->pkt_len;
+  if (cur_frame->flags.passed_dfilter){
+    if (sum_tally->filtered_count==0){
+           sum_tally->filtered_start= cur_time;
+           sum_tally->filtered_stop = cur_time;
+    } else {
+           if (cur_time < sum_tally->filtered_start) {
+                   sum_tally->start_time = cur_time;
+           }
+           if (cur_time > sum_tally->filtered_stop) {
+                   sum_tally->filtered_stop = cur_time;
+           }
     }
-    sum_tally->bytes += cur_frame->pkt_len;
-    if (cur_frame->passed_dfilter)
-         sum_tally->filtered_count++;
+    sum_tally->filtered_count++;
+    sum_tally->filtered_bytes += cur_frame->pkt_len ;
+  }
+  if (cur_frame->flags.marked)
+    sum_tally->marked_count++;
+
 }
 
 void
-summary_fill_in(summary_tally *st)
+summary_fill_in(capture_file *cf, summary_tally *st)
 {
 
   frame_data    *first_frame, *cur_frame;
   int          i;
   frame_data    *cur_glist;
 
- /* initialize the tally */
-  first_frame = cf.plist;
-  st->start_time = secs_usecs(first_frame->abs_secs,first_frame->abs_usecs) ;
-  st->stop_time = secs_usecs(first_frame->abs_secs,first_frame->abs_usecs) ;
+  st->start_time = 0;
+  st->stop_time = 0;
   st->bytes = 0;
   st->filtered_count = 0;
-  cur_glist = cf.plist;
-
-  for (i = 0; i < cf.count; i++) {
-    cur_frame = cur_glist;
-    tally_frame_data(cur_frame, st);
-    cur_glist = cur_glist->next;
+  st->filtered_start = 0;
+  st->filtered_stop   = 0;
+  st->filtered_bytes = 0;
+  st->marked_count = 0;
+
+  /* initialize the tally */
+  if (cf->plist != NULL) {
+    first_frame = cf->plist;
+    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;
+      tally_frame_data(cur_frame, st);
+      cur_glist = cur_glist->next;
+    }
   }
 
-  st->filename = cf.filename;
-  st->file_length = cf.f_len;
-  st->encap_type = cf.cd_t;
-  st->snap = cf.snap;
-  st->elapsed_time = secs_usecs(cf.esec, cf.eusec);
-  st->packet_count = cf.count;
-  st->drops = cf.drops;
-  st->iface = cf.iface;
-  st->dfilter = cf.dfilter;
-
-#ifdef HAVE_LIBPCAP
-  st->cfilter = cf.cfilter;
-#else
+  st->filename = cf->filename;
+  st->file_length = cf->f_datalen;
+  st->encap_type = cf->cd_t;
+  st->has_snap = cf->has_snap;
+  st->snap = cf->snap;
+  st->elapsed_time = nstime_to_sec(&cf->elapsed_time);
+  st->packet_count = cf->count;
+  st->drops_known = cf->drops_known;
+  st->drops = cf->drops;
+  st->dfilter = cf->dfilter;
+
+  /* capture related */
   st->cfilter = NULL;
-#endif
+  st->iface = NULL;
+  st->iface_descr = NULL;
+}
 
 
+#ifdef HAVE_LIBPCAP
+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;
+  }
 }
-
+#endif