From Peter Fuller:

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

diff --git a/summary.c b/summary.c
index 0ac1b8a5f168ee92613b8157c44b746055045dd7..d6d774f809f0cdbc6c053a2426014c36e0d0c982 100644 (file)
--- a/summary.c
+++ b/summary.c
@@ -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,21 @@ 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 ;
+  }
 }
 
 void
@@ -81,9 +97,12 @@ summary_fill_in(capture_file *cf, summary_tally *st)
   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;
 
   /* initialize the tally */
   if (cf->plist != NULL) {