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, 8 insertions, 0 deletions

diff --git a/epan/column.c b/epan/column.c
index 6a9a386490..7afaded3e3 100644
--- a/epan/column.c
+++ b/epan/column.c
@@ -55,6 +55,8 @@ col_format_to_string(gint fmt) {
     "%Yt",
     "%Tt",
     "%Gt",
+    "%rct",
+    "%dct",
     "%s",
     "%rs",
     "%us",
@@ -122,6 +124,8 @@ static const gchar *dlist[NUM_COL_FMTS] = {
 	"Absolute date and time",                   /* COL_ABS_DATE_TIME */
 	"Delta time",                               /* COL_DELTA_TIME */
 	"Delta time displayed",                     /* COL_DELTA_TIME_DIS */
+	"Relative time (conversation)",             /* COL_REL_CONV_TIME */
+	"Delta time (conversation)",                /* COL_DELTA_CONV_TIME */
 	"Source address",                           /* COL_DEF_SRC */
 	"Src addr (resolved)",                      /* COL_RES_SRC */
 	"Src addr (unresolved)",                    /* COL_UNRES_SRC */
@@ -490,6 +494,10 @@ get_column_longest_string(gint format)
     case COL_DELTA_TIME_DIS:
       return get_timestamp_column_longest_string(TS_DELTA_DIS, timestamp_get_precision());
       break;
+    case COL_REL_CONV_TIME:	/* 'abuse' TS_RELATIVE to set the time format */
+    case COL_DELTA_CONV_TIME:	/* for the conversation related time columns */
+      return get_timestamp_column_longest_string(TS_RELATIVE, timestamp_get_precision());
+      break;
     case COL_DEF_SRC:
     case COL_RES_SRC:
     case COL_UNRES_SRC: