aboutsummaryrefslogtreecommitdiffstats
path: root/tshark.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-07-04 21:43:34 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-07-04 21:43:34 +0000
commit2f05cf4dcfbecb970713c564fdbe8d0fa40d6ffb (patch)
tree48ae1991be5f20fc1b47e42036a09bc0a79f2717 /tshark.c
parent78d22ed8ee61de8e350b6228b07fa43f3384d489 (diff)
From Michael Mann:
Added ability to display UTC time or UTC time with date. I liked having the difference between UTC and local time, not just setting local=UTC. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2629 svn path=/trunk/; revision=37898
Diffstat (limited to 'tshark.c')
-rw-r--r--tshark.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/tshark.c b/tshark.c
index 1a3d761f40..5d19b2d5ec 100644
--- a/tshark.c
+++ b/tshark.c
@@ -1263,6 +1263,10 @@ main(int argc, char *argv[])
timestamp_set_type(TS_DELTA_DIS);
else if (strcmp(optarg, "e") == 0)
timestamp_set_type(TS_EPOCH);
+ else if (strcmp(optarg, "u") == 0)
+ timestamp_set_type(TS_UTC);
+ else if (strcmp(optarg, "ud") == 0)
+ timestamp_set_type(TS_UTC_WITH_DATE);
else {
cmdarg_err("Invalid time stamp type \"%s\"",
optarg);
@@ -3108,7 +3112,9 @@ print_columns(capture_file *cf)
case COL_CLS_TIME:
case COL_REL_TIME:
case COL_ABS_TIME:
- case COL_ABS_DATE_TIME: /* XXX - wider */
+ case COL_ABS_DATE_TIME:
+ case COL_UTC_TIME:
+ case COL_UTC_DATE_TIME: /* XXX - wider */
column_len = strlen(cf->cinfo.col_data[i]);
if (column_len < 10)
column_len = 10;