aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/editcap.pod2
-rw-r--r--doc/ethereal.pod.template2
-rw-r--r--doc/mergecap.pod2
-rw-r--r--doc/tethereal.pod.template2
-rw-r--r--wiretap/etherpeek.c16
-rw-r--r--wiretap/file.c6
6 files changed, 15 insertions, 15 deletions
diff --git a/doc/editcap.pod b/doc/editcap.pod
index 46df6c146f..b75703aadf 100644
--- a/doc/editcap.pod
+++ b/doc/editcap.pod
@@ -26,7 +26,7 @@ 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
+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
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index e87ae95398..f6be4051f8 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -41,7 +41,7 @@ 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,
+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
diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index b4f6d65624..c40434584e 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -23,7 +23,7 @@ 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
+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
diff --git a/doc/tethereal.pod.template b/doc/tethereal.pod.template
index 4742f7236a..7237b191da 100644
--- a/doc/tethereal.pod.template
+++ b/doc/tethereal.pod.template
@@ -40,7 +40,7 @@ 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
+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
diff --git a/wiretap/etherpeek.c b/wiretap/etherpeek.c
index 658d22fb43..23b5b62f38 100644
--- a/wiretap/etherpeek.c
+++ b/wiretap/etherpeek.c
@@ -1,8 +1,8 @@
/* etherpeek.c
- * Routines for opening etherpeek files
+ * Routines for opening EtherPeek (and TokenPeek?) files
* Copyright (c) 2001, Daniel Thompson <d.thompson@gmx.net>
*
- * $Id: etherpeek.c,v 1.8 2002/01/18 00:25:50 guy Exp $
+ * $Id: etherpeek.c,v 1.9 2002/01/18 00:48:37 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -38,7 +38,7 @@
/* CREDITS
*
* This file decoder could not have been writen without examining how
- * tcptrace (http://www.tcptrace.org/) handles etherpeek files.
+ * tcptrace (http://www.tcptrace.org/) handles EtherPeek files.
*/
/* master header */
@@ -134,14 +134,14 @@ int etherpeek_open(wtap *wth, int *err)
etherpeek_header_t ep_hdr;
struct timeval start_time;
- /* etherpeek files to not start with a magic value large enough
- * to be unique hence we use the following algorithm to determine
- * the type of an unknown file
+ /* EtherPeek files do not start with a magic value large enough
+ * to be unique; hence we use the following algorithm to determine
+ * the type of an unknown file:
* - populate the master header and reject file if there is no match
* - populate the secondary header and check that the reserved space
* is zero; there is an obvious flaw here so this algorithm will
- * probably need to be revisiting when improving etherpeek
- * support
+ * probably need to be revisiting when improving EtherPeek
+ * support.
*/
g_assert(sizeof(ep_hdr.master) == ETHERPEEK_MASTER_HDR_SIZE);
diff --git a/wiretap/file.c b/wiretap/file.c
index de1a289f54..0c8d21381a 100644
--- a/wiretap/file.c
+++ b/wiretap/file.c
@@ -1,6 +1,6 @@
/* file.c
*
- * $Id: file.c,v 1.77 2001/12/04 22:28:19 guy Exp $
+ * $Id: file.c,v 1.78 2002/01/18 00:48:37 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 trace (Macintosh V5 & V6)", NULL,
NULL, NULL },
/* WTAP_FILE_ETHERPEEK_MAC_V7 */
- { "Etherpeek trace (Macintosh V7)", NULL,
+ { "EtherPeek trace (Macintosh V7)", NULL,
NULL, NULL },
/* WTAP_FILE_VMS */