aboutsummaryrefslogtreecommitdiffstats
path: root/epan/timestamp.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-11-06 20:39:09 +0000
committerGuy Harris <guy@alum.mit.edu>2013-11-06 20:39:09 +0000
commit2a088c1d53ee1e1e3012f68aea745324a44e8120 (patch)
tree720d67bd7491d44e85fe80ba2e10d99d53ec3f49 /epan/timestamp.h
parent67f69e99e876f9303357b912f877b18f72380dba (diff)
Add support for displaying dates as year and day-of-year (1-origin).
In the process, fix various man page descriptions of the -t flag, and add support for UTC absolute times in the iousers and iostat TShark taps. svn path=/trunk/; revision=53114
Diffstat (limited to 'epan/timestamp.h')
-rw-r--r--epan/timestamp.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/epan/timestamp.h b/epan/timestamp.h
index 0992b3eaa0..9d90e6d2b4 100644
--- a/epan/timestamp.h
+++ b/epan/timestamp.h
@@ -36,13 +36,15 @@ extern "C" {
*/
typedef enum {
TS_RELATIVE, /* Since start of capture */
- TS_ABSOLUTE,
- TS_ABSOLUTE_WITH_DATE,
+ TS_ABSOLUTE, /* Local absolute time, without date */
+ TS_ABSOLUTE_WITH_YMD, /* Local absolute time, with date in YYYY-MM-DD form */
+ TS_ABSOLUTE_WITH_YDOY, /* Local absolute time, with date in YYYY DOY form */
TS_DELTA, /* Since previous captured packet */
TS_DELTA_DIS, /* Since previous displayed packet */
TS_EPOCH, /* Seconds (and fractions) since epoch */
- TS_UTC,
- TS_UTC_WITH_DATE,
+ TS_UTC, /* UTC absolute time, without date */
+ TS_UTC_WITH_YMD, /* UTC absolute time, with date in YYYY-MM-DD form */
+ TS_UTC_WITH_YDOY, /* UTC absolute time, with date in YYYY DOY form */
/*
* Special value used for the command-line setting in Wireshark, to indicate