diff options
| -rw-r--r-- | README | 18 | ||||
| -rw-r--r-- | doc/editcap.pod | 31 | ||||
| -rw-r--r-- | doc/ethereal.pod.template | 32 | ||||
| -rw-r--r-- | doc/mergecap.pod | 33 | ||||
| -rw-r--r-- | doc/tethereal.pod.template | 32 | ||||
| -rw-r--r-- | wiretap/file.c | 6 |
6 files changed, 79 insertions, 73 deletions
@@ -1,4 +1,4 @@ -$Id: README,v 1.52 2001/12/05 21:42:05 guy Exp $ +$Id: README,v 1.53 2002/01/22 22:38:02 guy Exp $ General Information ------- ----------- @@ -87,16 +87,16 @@ to read multiple file types. You can read the following file formats: libpcap (tcpdump -w, etc.) - this is Ethereal's native format -snoop -atmsnoop -Shomiti -LANalyzer -Sniffer (compressed and uncompressed) +snoop and atmsnoop +Shomiti/Finisar Surveyor +Novell LANalyzer +Network General/Network Associates DOS-based Sniffer (compressed and + uncompressed) Microsoft Network Monitor AIX's iptrace -NetXray -Sniffer Pro -Etherpeek versions 5, 6, and 7 for Macintosh +Cinco Networks NetXRray +Network Associates Windows-based Sniffer +AG Group/WildPackets EtherPeek/TokenPeek RADCOM's WAN/LAN Analyzer Lucent/Ascend access products HP-UX's nettl diff --git a/doc/editcap.pod b/doc/editcap.pod index b75703aadf..e2bb90102c 100644 --- a/doc/editcap.pod +++ b/doc/editcap.pod @@ -24,21 +24,22 @@ or all of the packets in that capture file to another capture file. B<Editcap> knows how to read B<libpcap> capture files, including those of B<tcpdump>, B<Ethereal>, and other tools that write captures in that format. 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<EtherPeek> versions 5, 6, and -7 for Macintosh, 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), the output from VMS's -B<TCPIPtrace> utility, the text output from the B<DBS Etherwatch> VMS -utility, and traffic capture files from Visual Networks' Visual UpTime. -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. +and B<atmsnoop>, Shomiti/Finisar B<Surveyor>, Novell B<LANalyzer>, +Network General/Network Associates DOS-based B<Sniffer> (compressed or +uncompressed), Microsoft B<Network Monitor>, AIX's B<iptrace>, Cinco +Networks B<NetXRay>, Network Associates Windows-based B<Sniffer>, AG +Group/WildPackets B<EtherPeek> and B<TokenPeek>, 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), the +output from VMS's B<TCPIPtrace> utility, the text output from the B<DBS +Etherwatch> VMS utility, and traffic capture files from Visual Networks' +Visual UpTime. 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 dc26b8df73..d9ef37dd6b 100644 --- a/doc/ethereal.pod.template +++ b/doc/ethereal.pod.template @@ -39,21 +39,23 @@ interactively browse packet data from a live network or from a previously saved capture file. B<Ethereal>'s native capture file format is B<libpcap> format, which is also the format used by B<tcpdump> and various other tools. In addition, B<Ethereal> 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<EtherPeek> versions 5, -6, and 7 for Macintosh, 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), the output from VMS's -B<TCPIPtrace> utility, the text output from the B<DBS Etherwatch> VMS -utility, and traffic capture files from Visual Networks' Visual Uptime. -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. +from B<snoop> and B<atmsnoop>, Shomiti/Finisar B<Surveyor>, Novell +B<LANalyzer>, Network General/Network Associates DOS-based B<Sniffer> +(compressed or uncompressed), Microsoft B<Network Monitor>, AIX's +B<iptrace>, Cinco Networks B<NetXRay>, Network Associates Windows-based +B<Sniffer>, AG Group/WildPackets B<EtherPeek> and B<TokenPeek>, +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), the output from VMS's B<TCPIPtrace> utility, the +text output from the B<DBS Etherwatch> VMS utility, and traffic capture +files from Visual Networks' Visual UpTime. 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 c40434584e..57345dea12 100644 --- a/doc/mergecap.pod +++ b/doc/mergecap.pod @@ -20,22 +20,23 @@ 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 how to read B<libpcap> capture files, including those of B<tcpdump>, B<Ethereal>, and other tools that write captures in that format. 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<EtherPeek> versions 5, 6, and 7 for -Macintosh, 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), the output from VMS's -B<TCPIPtrace> utility, the text output from the B<DBS Etherwatch> VMS -utility, and traffic capture files from Visual Networks' Visual UpTime. -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> recognizes this directly from the file; the '.gz' extension -is not required for this purpose. +addition, B<Mergecap> can read capture files from B<snoop> and +B<atmsnoop>, Shomiti/Finisar B<Surveyor>, Novell B<LANalyzer>, Network +General/Network Associates DOS-based B<Sniffer> (compressed or +uncompressed), Microsoft B<Network Monitor>, AIX's B<iptrace>, Cinco +Networks B<NetXRay>, Network Associates Windows-based B<Sniffer>, AG +Group/WildPackets B<EtherPeek> and B<TokenPeek>, 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), the +output from VMS's B<TCPIPtrace> utility, the text output from the B<DBS +Etherwatch> VMS utility, and traffic capture files from Visual Networks' +Visual UpTime. 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> 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 both input capture files to the output file. The diff --git a/doc/tethereal.pod.template b/doc/tethereal.pod.template index 7237b191da..4e546625f5 100644 --- a/doc/tethereal.pod.template +++ b/doc/tethereal.pod.template @@ -37,21 +37,23 @@ capture file, either printing a decoded form of those packets to the standard output or writing the packets to a file. B<Tethereal>'s native capture file format is B<libpcap> format, which is also the format used by B<tcpdump> and various other tools. In addition, B<Tethereal> 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<EtherPeek> versions 5, 6, and 7 for Macintosh, 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), the -output from VMS's B<TCPIPtrace> utility, the text output from the B<DBS -Etherwatch> VMS utility, and traffic capture files from Visual Networks' -Visual UpTime. 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. +read capture files from B<snoop> and B<atmsnoop>, Shomiti/Finisar +B<Surveyor>, Novell B<LANalyzer>, Network General/Network Associates +DOS-based B<Sniffer> (compressed or uncompressed), Microsoft B<Network +Monitor>, AIX's B<iptrace>, Cinco Networks B<NetXRay>, Network +Associates Windows-based B<Sniffer>, AG Group/WildPackets B<EtherPeek> +and B<TokenPeek>, 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), the output from VMS's +B<TCPIPtrace> utility, the text output from the B<DBS Etherwatch> VMS +utility, and traffic capture files from Visual Networks' Visual UpTime. +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 diff --git a/wiretap/file.c b/wiretap/file.c index 0c8d21381a..11dd155cde 100644 --- a/wiretap/file.c +++ b/wiretap/file.c @@ -1,6 +1,6 @@ /* file.c * - * $Id: file.c,v 1.78 2002/01/18 00:48:37 guy Exp $ + * $Id: file.c,v 1.79 2002/01/22 22:38:05 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -374,11 +374,11 @@ static const struct file_type_info { NULL, NULL }, /* WTAP_FILE_ETHERPEEK_MAC_V56 */ - { "EtherPeek trace (Macintosh V5 & V6)", NULL, + { "EtherPeek/TokenPeek trace (V5 & V6 file format)", NULL, NULL, NULL }, /* WTAP_FILE_ETHERPEEK_MAC_V7 */ - { "EtherPeek trace (Macintosh V7)", NULL, + { "EtherPeek/TokenPeek trace (V7 file format)", NULL, NULL, NULL }, /* WTAP_FILE_VMS */ |