diff options
author | Ahmad Fatoum <ahmad.fatoum@siemens.com> | 2017-08-07 16:38:52 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-08-22 07:55:26 +0000 |
commit | aca55a29f7b982e7a0bd9911d1d176561c8d7a84 (patch) | |
tree | 35b4f2b92ba79f49d26ebb06ae805e9eb6f4e4ac /doc | |
parent | 2845f6be8db0b1720e23db0877ec837f00967bdc (diff) |
Add hardware timestamping support
pcap provides a pcap_set_tstamp_type function, which can be used to request
hardware timestamps from a supporting kernel.
This patch adds support for aforementioned function as well as two new
command line options to dumpcap, wireshark and tshark:
--list-time-stamp-types
List time stamp types supported for the interface
--time-stamp-type <type>
Change the interface's timestamp method
Name choice mimics those used by tcpdump(1), which already supports this
feature. However, unlike tcpdump, we provide both options unconditionally.
If Wireshark was configured without pcap_set_tstamp_type being available,
--list-time-stamp-types reports an empty list.
Change-Id: I418a4b2b84cb01949cd262aad0ad8427f5ac0652
Signed-off-by: Ahmad Fatoum <ahmad.fatoum@siemens.com>
Reviewed-on: https://code.wireshark.org/review/23113
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/dumpcap.pod | 14 | ||||
-rw-r--r-- | doc/tshark.pod | 11 | ||||
-rw-r--r-- | doc/wireshark.pod.template | 11 |
3 files changed, 35 insertions, 1 deletions
diff --git a/doc/dumpcap.pod b/doc/dumpcap.pod index 1c76aa8fc2..e1e816bc4f 100644 --- a/doc/dumpcap.pod +++ b/doc/dumpcap.pod @@ -32,6 +32,8 @@ S<[ B<-v> ]> S<[ B<-w> E<lt>outfileE<gt> ]> S<[ B<-y> E<lt>capture link typeE<gt> ]> S<[ B<--capture-comment> E<lt>commentE<gt> ]> +S<[ B<--list-time-stamp-types> ]> +S<[ B<--time-stamp-type> E<lt>typeE<gt> ]> =head1 DESCRIPTION @@ -254,7 +256,8 @@ link types can be used for the B<-y> option. =item -M -When used with B<-D>, B<-L> or B<-S>, print machine-readable output. +When used with B<-D>, B<-L>, B<-S> or B<--list-time-stamp-types> print +machine-readable output. The machine-readable output is intended to be read by B<Wireshark> and B<TShark>; its format is subject to change from release to release. @@ -352,6 +355,15 @@ This option is only available if we output the captured packets to a single file in pcap-ng format. Only one capture comment may be set per output file. +=item --list-time-stamp-types + +List time stamp types supported for the interface. If no time stamp type can be +set, no time stamp types are listed. + +=item --time-stamp-type E<lt>typeE<gt> + +Change the interface's timestamp method. + =back =head1 CAPTURE FILTER SYNTAX diff --git a/doc/tshark.pod b/doc/tshark.pod index 664851bafe..185409468d 100644 --- a/doc/tshark.pod +++ b/doc/tshark.pod @@ -54,6 +54,8 @@ S<[ B<-Y> E<lt>displaY filterE<gt> ]> S<[ B<-M> E<lt>auto session resetE<gt> ]> S<[ B<-z> E<lt>statisticsE<gt> ]> S<[ B<--capture-comment> E<lt>commentE<gt> ]> +S<[ B<--list-time-stamp-types> ]> +S<[ B<--time-stamp-type> E<lt>typeE<gt> ]> S<[ B<--color> ]> S<[ B<--no-duplicate-keys> ]> S<[ B<--export-objects> E<lt>protocolE<gt>,E<lt>destdirE<gt> ]> @@ -1622,6 +1624,15 @@ Add a capture comment to the output file. This option is only available if a new output file in pcapng format is created. Only one capture comment may be set per output file. +=item --list-time-stamp-types + +List time stamp types supported for the interface. If no time stamp type can be +set, no time stamp types are listed. + +=item --time-stamp-type E<lt>typeE<gt> + +Change the interface's timestamp method. + =item --color Enable coloring of packets according to standard Wireshark color filters. This diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template index d89bf546fc..09fb6feaa2 100644 --- a/doc/wireshark.pod.template +++ b/doc/wireshark.pod.template @@ -53,6 +53,8 @@ S<[ B<--enable-protocol> E<lt>proto_nameE<gt> ]> S<[ B<--disable-protocol> E<lt>proto_nameE<gt> ]> S<[ B<--enable-heuristic> E<lt>short_nameE<gt> ]> S<[ B<--disable-heuristic> E<lt>short_nameE<gt> ]> +S<[ B<--list-time-stamp-types> ]> +S<[ B<--time-stamp-type> E<lt>typeE<gt> ]> S<[ E<lt>infileE<gt> ]> =head1 DESCRIPTION @@ -987,6 +989,15 @@ Enable dissection of heuristic protocol. Disable dissection of heuristic protocol. +=item --list-time-stamp-types + +List time stamp types supported for the interface. If no time stamp type can be +set, no time stamp types are listed. + +=item --time-stamp-type E<lt>typeE<gt> + +Change the interface's timestamp method. + =back =head1 INTERFACE |