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

3 files changed, 68 insertions, 30 deletions

diff --git a/doc/rawshark.pod b/doc/rawshark.pod
index 8d985bbc41..2eae524821 100644
--- a/doc/rawshark.pod
+++ b/doc/rawshark.pod
@@ -18,7 +18,7 @@ S<[ B<-r> E<lt>pipeE<gt>|- ]>
 S<[ B<-R> E<lt>read (display) filterE<gt> ]>
 S<[ B<-s> ]>
 S<[ B<-S> E<lt>field formatE<gt> ]>
-S<[ B<-t> ad|a|r|d|e ]>
+S<[ B<-t> a|ad|adoy|d|dd|e|r|u|ud|udoy ]>
 S<[ B<-v> ]>
 
 =head1 DESCRIPTION
@@ -217,25 +217,45 @@ B<%S> String value of the field.
 For something similar to Wireshark's standard display ("Type: A (1)") you
 could use B<%D: %S (%N)>.
 
-=item -t  ad|a|r|d|e
+=item -t  a|ad|adoy|d|dd|e|r|u|ud|udoy
 
-Set the format of the packet timestamp printed in summary lines, the default
-is relative. The format can be one of:
+Set the format of the packet timestamp printed in summary lines.
+The format can be one of:
 
-B<ad> absolute with date: The absolute date and time is the actual time and
-date the packet was captured
+B<a> absolute: The absolute time, as local time in your time zone,
+is the actual time the packet was captured, with no date displayed
 
-B<a> absolute: The absolute time is the actual time the packet was captured,
-with no date displayed
+B<ad> absolute with date: The absolute date, displayed as YYYY-MM-DD,
+and time, as local time in your time zone, is the actual time and date
+the packet was captured
 
-B<r> relative: The relative time is the time elapsed between the first packet
-and the current packet
+B<adoy> absolute with date using day of year: The absolute date,
+displayed as YYYY/DOY, and time, as local time in your time zone,
+is the actual time and date the packet was captured
 
 B<d> delta: The delta time is the time since the previous packet was
 captured
 
+B<dd> delta_displayed: The delta_displayed time is the time since the
+previous displayed packet was captured
+
 B<e> epoch: The time in seconds since epoch (Jan 1, 1970 00:00:00)
 
+B<r> relative: The relative time is the time elapsed between the first packet
+and the current packet
+
+B<u> UTC: The absolute time, as UTC, is the actual time the packet was
+captured, with no date displayed
+
+B<ud> UTC with date: The absolute date, displayed as YYYY-MM-DD,
+and time, as UTC, is the actual time and date the packet was captured
+
+B<udoy> UTC with date using day of year: The absolute date, displayed
+as YYYY/DOY, and time, as UTC, is the actual time and date the packet
+was captured
+
+The default format is relative.
+
 =item -v
 
 Print the version and exit.
diff --git a/doc/tshark.pod b/doc/tshark.pod
index d50447b9c6..10a3feb4bb 100644
--- a/doc/tshark.pod
+++ b/doc/tshark.pod
@@ -38,7 +38,7 @@ S<[ B<-r> E<lt>infileE<gt> ]>
 S<[ B<-R> E<lt>Read filterE<gt> ]>
 S<[ B<-s> E<lt>capture snaplenE<gt> ]>
 S<[ B<-S> E<lt>separatorE<gt> ]>
-S<[ B<-t> a|ad|d|dd|e|r|u|ud ]>
+S<[ B<-t> a|ad|adoy|d|dd|e|r|u|ud|udoy ]>
 S<[ B<-T> pdml|psml|ps|text|fields ]>
 S<[ B<-v> ]>
 S<[ B<-V> ]>
@@ -665,16 +665,21 @@ the default snapshot length is used if provided.
 
 Set the line separator to be printed between packets.
 
-=item -t  a|ad|d|dd|e|r|u|ud
+=item -t  a|ad|adoy|d|dd|e|r|u|ud|udoy
 
 Set the format of the packet timestamp printed in summary lines.
 The format can be one of:
 
-B<a> absolute: The absolute time is the actual time the packet was captured,
-with no date displayed
+B<a> absolute: The absolute time, as local time in your time zone,
+is the actual time the packet was captured, with no date displayed
 
-B<ad> absolute with date: The absolute date and time is the actual time and
-date the packet was captured
+B<ad> absolute with date: The absolute date, displayed as YYYY-MM-DD,
+and time, as local time in your time zone, is the actual time and date
+the packet was captured
+
+B<adoy> absolute with date using day of year: The absolute date,
+displayed as YYYY/DOY, and time, as local time in your time zone,
+is the actual time and date the packet was captured
 
 B<d> delta: The delta time is the time since the previous packet was
 captured
@@ -687,11 +692,15 @@ B<e> epoch: The time in seconds since epoch (Jan 1, 1970 00:00:00)
 B<r> relative: The relative time is the time elapsed between the first packet
 and the current packet
 
-B<u> UTC: The UTC time is the actual time the packet was captured,
-with no date displayed
+B<u> UTC: The absolute time, as UTC, is the actual time the packet was
+captured, with no date displayed
+
+B<ud> UTC with date: The absolute date, displayed as YYYY-MM-DD,
+and time, as UTC, is the actual time and date the packet was captured
 
-B<ud> UTC with date: The UTC date and time is the actual time and
-date the packet was captured
+B<udoy> UTC with date using day of year: The absolute date, displayed
+as YYYY/DOY, and time, as UTC, is the actual time and date the packet
+was captured
 
 The default format is relative.
 
diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template
index c36c246821..8a0e584918 100644
--- a/doc/wireshark.pod.template
+++ b/doc/wireshark.pod.template
@@ -40,7 +40,7 @@ S<[ B<-r> E<lt>infileE<gt> ]>
 S<[ B<-R> E<lt>read (display) filterE<gt> ]>
 S<[ B<-s> E<lt>capture snaplenE<gt> ]>
 S<[ B<-S> ]>
-S<[ B<-t> a|ad|d|dd|e|r|u|ud ]>
+S<[ B<-t> a|ad|adoy|d|dd|e|r|u|ud|udoy ]>
 S<[ B<-v> ]>
 S<[ B<-w> E<lt>outfileE<gt> ]>
 S<[ B<-X> E<lt>eXtension optionE<gt> ]>
@@ -549,16 +549,21 @@ the default snapshot length is used if provided.
 
 Automatically update the packet display as packets are coming in.
 
-=item -t  a|ad|d|dd|e|r|u|ud
+=item -t  a|ad|adoy|d|dd|e|r|u|ud|udoy
 
 Set the format of the packet timestamp displayed in the packet list
 window.  The format can be one of:
 
-B<a> absolute: The absolute time is the actual time the packet was captured,
-with no date displayed
+B<a> absolute: The absolute time, as local time in your time zone,
+is the actual time the packet was captured, with no date displayed
 
-B<ad> absolute with date: The absolute date and time is the actual time and
-date the packet was captured
+B<ad> absolute with date: The absolute date, displayed as YYYY-MM-DD,
+and time, as local time in your time zone, is the actual time and date
+the packet was captured
+
+B<adoy> absolute with date using day of year: The absolute date,
+displayed as YYYY/DOY, and time, as local time in your time zone,
+is the actual time and date the packet was captured
 
 B<d> delta: The delta time is the time since the previous packet was
 captured
@@ -571,11 +576,15 @@ B<e> epoch: The time in seconds since epoch (Jan 1, 1970 00:00:00)
 B<r> relative: The relative time is the time elapsed between the first packet
 and the current packet
 
-B<u> UTC: The UTC time is the actual time the packet was captured,
-with no date displayed
+B<u> UTC: The absolute time, as UTC, is the actual time the packet was
+captured, with no date displayed
+
+B<ud> UTC with date: The absolute date, displayed as YYYY-MM-DD,
+and time, as UTC, is the actual time and date the packet was captured
 
-B<ud> UTC with date: The UTC date and time is the actual time and
-date the packet was captured
+B<udoy> UTC with date using day of year: The absolute date, displayed
+as YYYY/DOY, and time, as UTC, is the actual time and date the packet
+was captured
 
 The default format is relative.