This patch adds two new column types:

- COL_REL_CONV_TIME which is used to display the time relative to the first frame that was seen in the conversation
- COL_DELTA_CONV_TIME which is used to display the delta time from the previous frame of the conversation

It also adds the function "col_set_time()" to "epan/column-utils.[ch]" which can be called from within a dissector to set either of these two columns to the appropiate time.

Last but not least, it lets the tcp-dissector make use of these two columns.


svn path=/trunk/; revision=23058

1 files changed, 14 insertions, 0 deletions

diff --git a/epan/column-utils.h b/epan/column-utils.h
index 141e9ce25d..946df43680 100644
--- a/epan/column-utils.h
+++ b/epan/column-utils.h
@@ -209,6 +209,20 @@ extern void	col_append_sep_fstr(column_info *cinfo, gint col, const gchar *sep,
 		const gchar *format, ...)
     GNUC_FORMAT_CHECK(printf, 4, 5);
 
+/** Set the given (relative) time to a column element.
+ *
+ * Used by multiple dissectors to set the time in the columns
+ * COL_REL_CONV_TIME and COL_DELTA_CONV_TIME
+ * 
+ * @param cinfo		the current packet row
+ * @param col		the column to use, e.g. COL_INFO
+ * @param ts		the time to set in the column
+ * @param fieldname	the fieldname to use for creating a filter (when 
+ *			  applying/preparing/copying as filter)
+ */
+extern void 	col_set_time(column_info *cinfo, int col,
+			nstime_t *ts, char *fieldname);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */