Suppress invalid or non-meaningful statistics - for example, without

time stamps on all packets in a set, you can't determine the start and
end time of the packets in the set (even one timestampless packet throws
the determination off - was that packet before the first time-stamped or
after the last time-stamped packet, or between them?).


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41187 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 24 insertions, 21 deletions

diff --git a/summary.h b/summary.h
index ec7062aaa2..15a2aaaa9d 100644
--- a/summary.h
+++ b/summary.h
@@ -33,45 +33,48 @@ typedef struct iface_options_tag {
     char	*name;
     char	*descr;
     char	*cfilter;
-    guint64	drops;				/* number of packet drops */
+    guint64	drops;		/* number of packet drops */
     gboolean	drops_known;	/* TRUE if number of packet drops is known */
-    gboolean	has_snap;		/* TRUE if maximum capture packet length is known */
-    int		snap;				/* Maximum captured packet length */
-    int		linktype;			/* wiretap encapsulation type */
+    gboolean	has_snap;	/* TRUE if maximum capture packet length is known */
+    int		snap;		/* Maximum captured packet length */
+    int		linktype;	/* wiretap encapsulation type */
 } iface_options;
 
 typedef struct _summary_tally {
-    guint64	bytes;				/**< total bytes */
-    double	start_time;			/**< seconds, with msec resolution */
-    double	stop_time;			/**< seconds, with msec resolution */
+    guint64	bytes;			/**< total bytes */
+    double	start_time;		/**< seconds, with msec resolution */
+    double	stop_time;		/**< seconds, with msec resolution */
     double	elapsed_time;		/**< seconds, with msec resolution,
-								   includes time before first packet
-								   and after last packet */
-    int		marked_count;		/**< number of marked packets */
+					   includes time before first packet
+					   and after last packet */
+    guint32	marked_count;		/**< number of marked packets */
+    guint32	marked_count_ts;	/**< number of time-stamped marked packets */
     guint64	marked_bytes;		/**< total bytes in the marked packets */
     double 	marked_start;		/**< time in seconds, with msec resolution */
     double 	marked_stop;		/**< time in seconds, with msec resolution */
-    int		ignored_count;		/**< number of ignored packets */
-    int		packet_count;		/**< total number of packets in trace */
-    int		filtered_count;		/**< number of filtered packets */
+    guint32	ignored_count;		/**< number of ignored packets */
+    guint32	packet_count;		/**< total number of packets in trace */
+    guint32	packet_count_ts;	/**< total number of time-stamped packets in trace */
+    guint32	filtered_count;		/**< number of filtered packets */
+    guint32	filtered_count_ts;	/**< number of time-stamped filtered packets */
     guint64	filtered_bytes;		/**< total bytes in the filtered packets */
     double 	filtered_start;		/**< time in seconds, with msec resolution */
     double 	filtered_stop;		/**< time in seconds, with msec resolution */
     const char	*filename;
     gint64	file_length;		/**< file length in bytes */
-    int		file_type;			/**< wiretap file type */
-    int		encap_type;			/**< wiretap encapsulation type */
+    int		file_type;		/**< wiretap file type */
+    int		encap_type;		/**< wiretap encapsulation type */
     gboolean	has_snap;		/**< TRUE if maximum capture packet length is known */
-    int		snap;				/**< Maximum captured packet length */
-    gboolean    drops_known;	/**< TRUE if number of packet drops is known */
+    int		snap;			/**< Maximum captured packet length */
+    gboolean    drops_known;		/**< TRUE if number of packet drops is known */
     guint64     drops;			/**< number of packet drops */
     const char	*dfilter;		/**< display filter */
     gboolean    is_tempfile;
 	/* from SHB, use summary_fill_shb_inf() to get values */
-    gchar       *opt_comment;   /**< comment from SHB block */
-    gchar       *shb_hardware;  /**< Capture HW from SHB block */
-    gchar       *shb_os;        /**< The OS the capture was made on from SHB block */
-    gchar       *shb_user_appl; /**< The application that made the capture from SHB block */
+    gchar       *opt_comment;   	/**< comment from SHB block */
+    gchar       *shb_hardware;		/**< Capture HW from SHB block */
+    gchar       *shb_os;		/**< The OS the capture was made on from SHB block */
+    gchar       *shb_user_appl;		/**< The application that made the capture from SHB block */
     /* capture related, use summary_fill_in_capture() to get values */
     GArray	*ifaces;
     gboolean	legacy;