aboutsummaryrefslogtreecommitdiffstats
path: root/epan/timestamp.h
diff options
context:
space:
mode:
authorStephen Fisher <steve@stephen-fisher.com>2006-12-05 03:19:51 +0000
committerStephen Fisher <steve@stephen-fisher.com>2006-12-05 03:19:51 +0000
commit75acf34518617ddb64be049e13393f477a15d0dd (patch)
tree66912a037dc8a2b4910cfa0fdc8b9d85f01e1c2b /epan/timestamp.h
parentd11958ec6fdafc3305b9e3239783db00078e03ba (diff)
From Douglas Pratley with trivial changes and documentation changes
by myself: Corrected patch; epan/column.c and epan/column_utils.c were not included. This one has now been properly tested against a clean checkout of today's code. - New menu option available under view\time display format - New sub-option (e) to -t switch for both wireshark and tshark - Extended recent settings code to handle new value - Did NOT add new explicit epoch time column svn path=/trunk/; revision=20040
Diffstat (limited to 'epan/timestamp.h')
-rw-r--r--epan/timestamp.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/timestamp.h b/epan/timestamp.h
index 03dbf70403..3e22c6222e 100644
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -29,10 +29,12 @@
* Type of time-stamp shown in the summary display.
*/
typedef enum {
- TS_RELATIVE,
+ TS_RELATIVE, /* Since start of capture */
TS_ABSOLUTE,
TS_ABSOLUTE_WITH_DATE,
- TS_DELTA,
+ TS_DELTA, /* Since previous packet */
+ TS_EPOCH, /* Seconds (and fractions) since epoch */
+
/*
* Special value used for the command-line setting in Wireshark, to indicate
* that no value has been set from the command line.