VMS TCPIPtrace wiretap module, from Marc Milgram.

Update the lists of known capture file formats in the Tethereal,
editcap, and mergecap man pages to match the current list (as found in
the Ethereal man page).

svn path=/trunk/; revision=4039

4 files changed, 32 insertions, 24 deletions

diff --git a/doc/editcap.pod b/doc/editcap.pod
index 7ebcb9f76d..0611d904b9 100644
--- a/doc/editcap.pod
+++ b/doc/editcap.pod
@@ -25,14 +25,17 @@ B<Editcap> knows how to read B<libpcap> capture files, including those
 of B<tcpdump>.  In addition, B<Editcap> can read capture files from
 B<snoop> (including B<Shomiti>) and B<atmsnoop>, B<LanAlyzer>,
 B<Sniffer> (compressed or uncompressed), Microsoft B<Network Monitor>,
-AIX's B<iptrace>, B<NetXray>, B<Sniffer Pro>, B<RADCOM>'s WAN/LAN
-analyzer, B<Lucent/Ascend> router debug output, HP-UX's B<nettl>, and
-the dump output from B<Toshiba's> ISDN routers.  There is no need to
-tell B<Editcap> what type of file you are reading; it will determine the
-file type by itself.  B<Editcap> is also capable of reading any of these
-file formats if they are compressed using gzip.  B<Editcap> recognizes
-this directly from the file; the '.gz' extension is not required for
-this purpose.
+AIX's B<iptrace>, B<NetXray>, B<Sniffer Pro>, B<Etherpeek>, B<RADCOM>'s
+WAN/LAN analyzer, B<Lucent/Ascend> router debug output, HP-UX's
+B<nettl>, the dump output from B<Toshiba's> ISDN routers, the output
+from B<i4btrace> from the ISDN4BSD project, the output in B<IPLog>
+format from the Cisco Secure Intrusion Detection System, B<pppd logs>
+(pppdump format), and the output from VMS's B<TCPIPtrace> utility. 
+There is no need to tell B<Editcap> what type of file you are reading;
+it will determine the file type by itself.  B<Editcap> is also capable
+of reading any of these file formats if they are compressed using gzip. 
+B<Editcap> recognizes this directly from the file; the '.gz' extension
+is not required for this purpose.
 
 By default, it writes the capture file in B<libpcap> format, and writes
 all of the packets in the capture file to the output file.  The B<-F>
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index fab4dc3d6a..2497d649c2 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -42,12 +42,12 @@ Pro>, B<Etherpeek>, B<RADCOM>'s WAN/LAN analyzer, B<Lucent/Ascend>
 router debug output, HP-UX's B<nettl>, the dump output from B<Toshiba's>
 ISDN routers, the output from B<i4btrace> from the ISDN4BSD project, the
 output in B<IPLog> format from the Cisco Secure Intrusion Detection
-System, and B<pppd logs> (pppdump format).  There is no need to tell
-B<Ethereal> what type of file you are reading; it will determine the
-file type by itself.  B<Ethereal> is also capable of reading any of
-these file formats if they are compressed using gzip.  B<Ethereal>
-recognizes this directly from the file; the '.gz' extension is not
-required for this purpose.
+System, B<pppd logs> (pppdump format), and the output from VMS's
+B<TCPIPtrace> utility.  There is no need to tell B<Ethereal> what type
+of file you are reading; it will determine the file type by itself. 
+B<Ethereal> is also capable of reading any of these file formats if they
+are compressed using gzip.  B<Ethereal> recognizes this directly from
+the file; the '.gz' extension is not required for this purpose.
 
 Like other protocol analyzers, B<Ethereal>'s main window shows 3 views
 of a packet.  It shows a summary line, briefly describing what the
diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index 2cb39523ca..7b123e602a 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -17,14 +17,17 @@ I<...>
 =head1 DESCRIPTION
 
 B<Mergecap> is a program that combines multiple saved capture files into
-a single output file specified by the B<-w> argument. B<Mergecap> knows
+a single output file specified by the B<-w> argument.  B<Mergecap> knows
 how to read B<libpcap> capture files, including those of B<tcpdump>.  In
 addition, B<Mergecap> can read capture files from B<snoop> (including
 B<Shomiti>) and B<atmsnoop>, B<LanAlyzer>, B<Sniffer> (compressed or
 uncompressed), Microsoft B<Network Monitor>, AIX's B<iptrace>,
-B<NetXray>, B<Sniffer Pro>, B<RADCOM>'s WAN/LAN analyzer,
-B<Lucent/Ascend> router debug output, HP-UX's B<nettl>, and the dump
-output from B<Toshiba's> ISDN routers.  There is no need to tell
+B<NetXray>, B<Sniffer Pro>, B<Etherpeek>, B<RADCOM>'s WAN/LAN analyzer,
+B<Lucent/Ascend> router debug output, HP-UX's B<nettl>, the dump output
+from B<Toshiba's> ISDN routers, the output from B<i4btrace> from the
+ISDN4BSD project, the output in B<IPLog> format from the Cisco Secure
+Intrusion Detection System, B<pppd logs> (pppdump format), and the
+output from VMS's B<TCPIPtrace> utility.  There is no need to tell
 B<Mergecap> what type of file you are reading; it will determine the
 file type by itself.  B<Mergecap> is also capable of reading any of
 these file formats if they are compressed using gzip.  B<Mergecap>
diff --git a/doc/tethereal.pod.template b/doc/tethereal.pod.template
index 78391d13ad..6c2c122731 100644
--- a/doc/tethereal.pod.template
+++ b/doc/tethereal.pod.template
@@ -40,12 +40,14 @@ uncompressed), Microsoft B<Network Monitor>, AIX's B<iptrace>,
 B<NetXray>, B<Sniffer Pro>, B<Etherpeek>, B<RADCOM>'s WAN/LAN analyzer,
 B<Lucent/Ascend> router debug output, HP-UX's B<nettl>, the dump output
 from B<Toshiba's> ISDN routers, the output from B<i4btrace> from the
-ISDN4BSD project, and output in IPLog format from the Cisco Secure
-Intrusion Detection System.  There is no need to tell B<Tethereal> what
-type of file you are reading; it will determine the file type by itself. 
-B<Tethereal> is also capable of reading any of these file formats if
-they are compressed using gzip.  B<Tethereal> recognizes this directly
-from the file; the '.gz' extension is not required for this purpose.
+ISDN4BSD project, the output in B<IPLog> format from the Cisco Secure
+Intrusion Detection System, B<pppd logs> (pppdump format), and the
+output from VMS's B<TCPIPtrace> utility.  There is no need to tell
+B<Tethereal> what type of file you are reading; it will determine the
+file type by itself.  B<Tethereal> is also capable of reading any of
+these file formats if they are compressed using gzip.  B<Tethereal>
+recognizes this directly from the file; the '.gz' extension is not
+required for this purpose.
 
 If the B<-w> flag is not specified, B<Tethereal> prints a decoded form
 of the packets it captures or reads; otherwise, it writes those packets