From 34f4ff7baeb596d7e64e1a99813fa2eb8ad15852 Mon Sep 17 00:00:00 2001 From: Ulf Lamping Date: Wed, 11 Jan 2006 01:53:46 +0000 Subject: [PATCH] instead of repeating the capture file format description over and over again (this list also tends to become outdated), just give a small description and refer to the Ethereal man page svn path=/trunk/; revision=16997 --- doc/capinfos.pod | 2 +- doc/editcap.pod | 130 +++++++++-------------------------------------- doc/mergecap.pod | 114 ++++++----------------------------------- 3 files changed, 40 insertions(+), 206 deletions(-) diff --git a/doc/capinfos.pod b/doc/capinfos.pod index 68933891ef..9848ad65ed 100644 --- a/doc/capinfos.pod +++ b/doc/capinfos.pod @@ -31,7 +31,7 @@ will report all statistics available. B is able to detect and read the same capture files that are supported by B. -The input file doesn't need a specific filename extension, the file +The input files don't need a specific filename extension, the file format and an optional gzip compression will be automatically detected. The I section of I or I diff --git a/doc/editcap.pod b/doc/editcap.pod index 99cf40ae13..40364c4d85 100644 --- a/doc/editcap.pod +++ b/doc/editcap.pod @@ -26,17 +26,28 @@ B is a program that reads some or all of the captured packets from the I, optionally converts them in various ways and writes the resulting packets to the capture I (or outfiles). -By default, it reads all packets from the I and writes them to the I -in libpcap file format. +By default, it reads all packets from the I and writes them to the +I in libpcap file format. -A list of packet numbers can be specified on the command line; ranges of packet numbers can be -specified as I-I, referring to all packets from I to -I. -The selected packets with those numbers will I be written to the capture file. -If the B<-r> flag is specified, the whole packet selection is reversed; in that case I the selected packets -will be written to the capture file. +A list of packet numbers can be specified on the command line; ranges of +packet numbers can be specified as I-I, referring to all packets +from I to I. +The selected packets with those numbers will I be written to the +capture file. +If the B<-r> flag is specified, the whole packet selection is reversed; +in that case I the selected packets will be written to the capture file. -The supported input and output capture file formats are described in a section below. +B is able to detect, read and write the same capture files that +are supported by B. +The input file doesn't need a specific filename extension, the file +format and an optional gzip compression will be automatically detected. +The I section of I or +I +provides a detailed description. + +B can write the file in several output formats. The B<-F> +flag can be used to specify the format in which to write the capture +file, B provides a list of the available output formats. =head1 OPTIONS @@ -174,104 +185,6 @@ To introduce 5% random errors in a capture file use: =back -=head1 Capture File Formats - -There is no need to tell B what type of -file you are reading; it will determine the file type by itself. - -B is also capable of reading any of these file formats if they -are compressed using gzip. It recognizes this directly from the -file; the '.gz' extension is not required for this purpose. - -The following I file formats are supported: - -=over 4 - -=item * -libpcap/WinPcap, tcpdump and various other tools using tcpdump's capture format - -=item * -B and B - -=item * -Shomiti/Finisar B captures - -=item * -Novell B captures - -=item * -Microsoft B captures - -=item * -AIX's B captures - -=item * -Cinco Networks B captures - -=item * -Network Associates Windows-based B captures - -=item * -Network General/Network Associates DOS-based B (compressed or uncompressed) captures - -=item * -AG Group/WildPackets B/B/B/B/B captures - -=item * -B's WAN/LAN analyzer captures - -=item * -Network Instruments B version 9 captures - -=item * -B router debug output - -=item * -files from HP-UX's B - -=item * -B ISDN routers dump output - -=item * -the output from B from the ISDN4BSD project - -=item * -traces from the B USB S0. - -=item * -the output in B format from the Cisco Secure Intrusion Detection System - -=item * -B (pppdump format) - -=item * -the output from VMS's B/B/B utilities - -=item * -the text output from the B VMS utility - -=item * -Visual Networks' B traffic capture - -=item * -the output from B L2 debug - -=item * -the output from Accellent's B<5Views> LAN agents - -=item * -Endace Measurement Systems' ERF format captures - -=item * -Linux Bluez Bluetooth stack B traces - -=back - -B can write the file in several output formats. The B<-F> -flag can be used to specify the format in which to write the capture -file, B provides -a list of the available output formats. - =head1 SEE ALSO I, I, I, I @@ -281,6 +194,9 @@ I, I, I, I B is part of the B distribution. The latest version of B can be found at B. +HTML versions of the Ethereal project man pages are available at: +http://www.ethereal.com/docs/man-pages + =head1 AUTHORS Original Author diff --git a/doc/mergecap.pod b/doc/mergecap.pod index 6fc4e12701..bcbc745bf1 100644 --- a/doc/mergecap.pod +++ b/doc/mergecap.pod @@ -26,6 +26,19 @@ B, and other tools that write captures in that format. By default, it writes the capture file in B format, and writes all of the packets in both input capture files to the output file. +B is able to detect, read and write the same capture files that +are supported by B. +The input files don't need a specific filename extension, the file +format and an optional gzip compression will be automatically detected. +The I section of I or +I +provides a detailed description. + +B can write the file in several output formats. +The B<-F> flag can be used to specify the format in which to write the +capture file, B provides a list of the available output +formats. + Packets from the input files are merged in chronological order based on each frame's timestamp, unless the B<-a> flag is specified. B assumes that frames within a single capture file are already stored in @@ -105,104 +118,6 @@ fddi>' is specified). =back -=head1 CAPTURE FILE FORMATS - -There is no need to tell B what type of -file you are reading; it will determine the file type by itself. - -B is also capable of reading any of these file formats if they -are compressed using gzip. B recognizes this directly from -the file; the '.gz' extension is not required for this purpose. - -The following I file formats are supported: - -=over 4 - -=item * -libpcap/WinPcap, tcpdump and various other tools using tcpdump's capture format - -=item * -B and B - -=item * -Shomiti/Finisar B captures - -=item * -Novell B captures - -=item * -Microsoft B captures - -=item * -AIX's B captures - -=item * -Cinco Networks B captures - -=item * -Network Associates Windows-based B captures - -=item * -Network General/Network Associates DOS-based B (compressed or uncompressed) captures - -=item * -AG Group/WildPackets B/B/B/B/B captures - -=item * -B's WAN/LAN analyzer captures - -=item * -Network Instruments B version 9 captures - -=item * -B router debug output - -=item * -files from HP-UX's B - -=item * -B ISDN routers dump output - -=item * -the output from B from the ISDN4BSD project - -=item * -traces from the B USB S0. - -=item * -the output in B format from the Cisco Secure Intrusion Detection System - -=item * -B (pppdump format) - -=item * -the output from VMS's B/B/B utilities - -=item * -the text output from the B VMS utility - -=item * -Visual Networks' B traffic capture - -=item * -the output from B L2 debug - -=item * -the output from Accellent's B<5Views> LAN agents - -=item * -Endace Measurement Systems' ERF format captures - -=item * -Linux Bluez Bluetooth stack B traces - -=back - -B can write the file in several output formats. -The B<-F> flag can be used to specify the format in which to write the -capture file, B provides a list of the available output -formats. - =head1 SEE ALSO I, I, I, I @@ -215,6 +130,9 @@ B is based heavily upon B by Richard Sharpe B is part of the B distribution. The latest version of B can be found at B. +HTML versions of the Ethereal project man pages are available at: +http://www.ethereal.com/docs/man-pages + =head1 AUTHORS Original Author