diff options
105 files changed, 311 insertions, 311 deletions
@@ -389,7 +389,7 @@ Mark Muhlestein <mmm[AT]netapp.com> { } Graham Bloice <graham.bloice[AT]trihedral.com> { - Win32 icon for Ethereal, and Win32 resource-compiler files to + Win32 icon for Wireshark, and Win32 resource-compiler files to add version/copyright/etc. information to Win32 executables Support for sorting columns in the summary by clicking on them Win32 Makefile improvements @@ -1114,7 +1114,7 @@ concentrate common capture related code in capture_opts.c, e.g. trying to find t remove redundant code from dumpcap.c -this also implements command line option -D (and indexed interfaces at -i) for Ethereal and Dumpcap (as we have it in Tethereal already for a while) +this also implements command line option -D (and indexed interfaces at -i) for Wireshark and Dumpcap (as we have it in Tethereal already for a while) ------------------------------------------------------------------------ r16786 | ulfl | 2005-12-13 16:35:28 -0600 (Tue, 13 Dec 2005) | 1 line @@ -1414,7 +1414,7 @@ Changed paths: M /trunk/tools/pidl/lib/Parse/Pidl/Ethereal/NDR.pm The Bitmap routine in lib/Parse/Pidl/Ethereal/NDR.pm in Pidl generates -fields as BASE_DEC; bitmaps are typically displayed in hex in Ethereal, +fields as BASE_DEC; bitmaps are typically displayed in hex in Wireshark, so it should generate BASE_HEX instead. (Submitted to bugzilla.samba.org as bug 3313.) @@ -2242,7 +2242,7 @@ Changed paths: replace all appearances of 'fprintf(stderr, "tethereal: ' with 'cmdarg_err("', this is: a) smaller -b) makes it possible to use some functions for Ethereal too +b) makes it possible to use some functions for Wireshark too c) is the wrong name now, as some outputs are not command line related :-( use capture_opts_trim() @@ -3914,7 +3914,7 @@ Changed paths: M /trunk/gtk/main.c M /trunk/tethereal.c -Handle "-G" only in Tethereal - it doesn't work in Ethereal, and isn't +Handle "-G" only in Tethereal - it doesn't work in Wireshark, and isn't necessary there. Add a "cmdarg_err()" routine to report command-line option errors; it @@ -5864,7 +5864,7 @@ Changed paths: M /trunk/epan/libethereal.def M /trunk/ethereal_gen.py -1. replace "and" with "&&" in ethereal_gen.py:2103 +1. replace "and" with "&&" in wireshark_gen.py:2103 2. add make_printable_string in libethereal.def @@ -1,5 +1,5 @@ - The Ethereal FAQ + The Wireshark FAQ Note: This is just an ASCII snapshot of the faq and may not be up to date. Please go to http://www.ethereal.com/faq.html for the up @@ -247,11 +247,11 @@ Q 1.2: How much does Ethereal cost? - A: Ethereal is "free software"; you can download it without paying any + A: Wireshark is "free software"; you can download it without paying any license fee. The version of Ethereal you download isn't a "demo" version, with limitations not present in a "full" version; it is the full version. - The license under which Ethereal is issued is the GNU General Public + The license under which Wireshark is issued is the GNU General Public License. See the GNU GPL FAQ for some more information. Q 1.3: Can I use Ethereal commercially? @@ -265,7 +265,7 @@ Q 1.4: Can I use Ethereal as part of my commercial product? - A: As noted, Ethereal is licensed under the GNU General Public License. The + A: As noted, Wireshark is licensed under the GNU General Public License. The GPL imposes conditions on your use of GPL'ed code in your own products; you cannot, for example, make a "derived work" from Ethereal, by making modifications to it, and then sell the resulting derived work and not allow @@ -1172,15 +1172,15 @@ cies Q 3.1: I installed an Ethereal RPM; why did it install Tethereal but not Ethereal? - A: Older versions of the Red Hat RPMs for Ethereal put only the non-GUI - components into the ethereal RPM, the fact that Ethereal is a GUI program + A: Older versions of the Red Hat RPMs for Wireshark put only the non-GUI + components into the ethereal RPM, the fact that Wireshark is a GUI program nonwithstanding; newer versions make it a bit clearer by giving that RPM a - name starting with ethereal-base. + name starting with wireshark-base. In those older versions, there's a separate ethereal-gnome RPM that includes GUI components such as Ethereal itself, the fact that Ethereal doesn't use GNOME nonwithstanding; newer versions make it a bit clearer by giving that - RPM a name starting with ethereal-gtk+. + RPM a name starting with wireshark-gtk+. Find the ethereal-gnome or ethereal-gtk+ RPM, and install that also. @@ -1275,7 +1275,7 @@ cies "** ERROR **: file print.c: line 691 (print_line): should not be reached. - A: This is a bug in Ethereal 0.10.0a, which is fixed in 0.10.1 and later + A: This is a bug in Wireshark 0.10.0a, which is fixed in 0.10.1 and later releases. To work around the bug, don't use "-x" unless you're also using "-V"; note that "-V" produces a full dissection of each packet, so you might not want to use it. @@ -1293,7 +1293,7 @@ cies A: Ethereal can only be linked with version 4.2.2 or later of UCD SNMP. Your version of Ethereal was dynamically linked with such a version of UCD SNMP; however, you have an older version of UCD SNMP installed, which means that - when Ethereal is run, it tries to link to the older version, and fails. You + when Wireshark is run, it tries to link to the older version, and fails. You will have to replace that version of UCD SNMP with version 4.2.2 or a later version. @@ -1322,7 +1322,7 @@ cies when I try to run Ethereal on Windows? - A: Ethereal is built using the GTK+ toolkit, which supports most + A: Wireshark is built using the GTK+ toolkit, which supports most UNIX-flavored OSes, and also supports Windows. Windows versions of Ethereal before 0.9.14 were built with an older version @@ -1354,7 +1354,7 @@ cies Gtk-CRITICAL **: file gtkwindow.c: line 3107 (gtk_window_resize): assertion `height > 0' failed. - A: This is a bug in Ethereal 0.10.5 and 0.10.5a, which is fixed in Ethereal + A: This is a bug in Wireshark 0.10.5 and 0.10.5a, which is fixed in Wireshark 0.10.6 and later releases. Q 6.2: I have an XXX network card on my machine; if I try to capture on it, @@ -1561,8 +1561,8 @@ cies A: Capture filters currently use a different syntax than display filters. Here's the corresponding section from the ethereal(1) man page: - "Display filters in Ethereal are very powerful; more fields are filterable - in Ethereal than in other protocol analyzers, and the syntax you can use to + "Display filters in Wireshark are very powerful; more fields are filterable + in Wireshark than in other protocol analyzers, and the syntax you can use to create your filters is richer. As Ethereal progresses, expect more and more protocol fields to be allowed in display filters. @@ -1593,7 +1593,7 @@ cies this bug. If you are running Ethereal on a UNIX-flavored platform, run "ethereal -v", - or select "About Ethereal..." from the "Help" menu in Ethereal, to see what + or select "About Ethereal..." from the "Help" menu in Wireshark, to see what version of libpcap it's using. If it's not 0.6 or later, you will need either to upgrade your OS to get a later version of libpcap, or will need to build and install a later version of libpcap from the tcpdump.org Web site @@ -1685,7 +1685,7 @@ cies Q 7.12: Why does Ethereal hang after I stop a capture? - A: The most likely reason for this is that Ethereal is trying to look up an + A: The most likely reason for this is that Wireshark is trying to look up an IP address in the capture to convert it to a name (so that, for example, it can display the name in the source address or destination address columns), and that lookup process is taking a very long time. @@ -1941,7 +1941,7 @@ cies A: Unfortunately, Windows 95/98/Me gives the same name to multiple instances of the type of same network adapter. Therefore, WinPcap cannot distinguish between them, so a WinPcap-based application can capture only on the first - such interface; Ethereal is a libpcap/WinPcap-based application. + such interface; Wireshark is a libpcap/WinPcap-based application. Q 8.6: I'm running Ethereal on Windows; why am I not seeing any traffic being sent by the machine running Ethereal? @@ -2156,7 +2156,7 @@ cies Q 11.1: Why am I seeing lots of packets with incorrect TCP checksums? A: If the packets that have incorrect TCP checksums are all being sent by - the machine on which Ethereal is running, this is probably because the + the machine on which Wireshark is running, this is probably because the network interface on which you're capturing does TCP checksum offloading. That means that the TCP checksum is added to the packet by the network interface, not by the OS's TCP/IP stack; when capturing on an interface, @@ -2212,7 +2212,7 @@ cies subsequent RTP traffic will be identified. Currently, that's the only place we do that; there may be other places. - However, there will always be places where Ethereal is simply incapable of + However, there will always be places where Wireshark is simply incapable of deducing that a given UDP flow is RTP; a mechanism would be needed to allow the user to specify that a given conversation should be treated as RTP. As of Ethereal 0.8.16, such a mechanism exists; if you select a UDP or TCP @@ -128,7 +128,7 @@ README.win32 for those instructions. By default, if 'configure' finds zlib (a.k.a, libz), the wiretap library will be built so that it can read compressed capture files. If you have zlib but do not wish to build - it into the wiretap library, used by Ethereal, Tethereal, and + it into the wiretap library, used by Wireshark, Tethereal, and the capture-file utilities that come in this package, use this switch. diff --git a/Makefile.am b/Makefile.am index 3089533a3d..a13b6cec26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am -# Automake file for Ethereal +# Automake file for Wireshark # # $Id$ # @@ -266,7 +266,7 @@ endif # HAVE_PLUGINS # list ever grows to include something that can't be linked with # tethereal, or if tethereal needs something that ethereal doesn't, # we should probably split this into stuff needed both -# by ethereal and tethereal and stuff needed only by one or the +# by wireshark and tethereal and stuff needed only by one or the # other. ethereal_optional_objects = @GETOPT_O@ @SNPRINTF_O@ @STRERROR_O@ \ @STRCASECMP_O@ @STRNCASECMP_O@ @MKSTEMP_O@ @STRPTIME_O@ diff --git a/Makefile.nmake b/Makefile.nmake index ef6bf13272..9f5a6a1ad1 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -590,7 +590,7 @@ setup: verify_tools gtk-wimp gtk-wimp/gtk-wimp-0.7.0-bin.zip !ENDIF @echo. - @echo Ethereal is ready to build. + @echo Wireshark is ready to build. # Cleanup files installed by the setup target. It will not remove the # downloaded zip files. @@ -229,7 +229,7 @@ Ethereal 0.10.13 has been released. o A new capture file format "Nanosecond libpcap (Ethereal)" was added. It is very similar to the common libpcap file format but is capable of keeping nanosecond resolution timestamps. This format is currently - supported only by Ethereal. + supported only by Wireshark. o Ethereal's memory managment has been greatly improved. @@ -931,7 +931,7 @@ New and updated capture file support Ethereal 0.10.6 has been released. - This release fixes a preferences bug present in Ethereal which displayed + This release fixes a preferences bug present in Wireshark which displayed (ethereal.exe:3512): Gtk-CRITICAL **: file gtkwindow.c: line 3107 (gtk_window_resize): assertion `height > 0' failed @@ -1387,7 +1387,7 @@ New and updated features A preference file has been added for disabled protocols. - Color filters may now be imported and exported from within Ethereal. + Color filters may now be imported and exported from within Wireshark. A new column type has been added for cumulative bytes. @@ -1711,7 +1711,7 @@ New and Updated Features A protocol hierarchy statistics tap was added to tethereal. This code - may be used to replace the hierarchy statistics code in Ethereal. + may be used to replace the hierarchy statistics code in Wireshark. More updates have been added to TCP analysis. diff --git a/README.hpux b/README.hpux index cc061fb9c9..c81b9c9e66 100644 --- a/README.hpux +++ b/README.hpux @@ -16,7 +16,7 @@ The Software Porting And Archive Centre for HP-UX, at (with mirrors in various countries, listed on the Centre's home page; you may want to choose a mirror closer to you) has ported versions, in -both source and binary form, for Ethereal, as well as for the libpcap, +both source and binary form, for Wireshark, as well as for the libpcap, GLib, GTK+, and zlib libraries that it uses. The changes they've made appear largely to be compile option changes; if diff --git a/README.win32 b/README.win32 index a13a8f52d9..0f62b87bcd 100644 --- a/README.win32 +++ b/README.win32 @@ -16,7 +16,7 @@ The installation package allows you to install: o Tethereal - the console, line-mode version o Editcap - a console, line-mode utility to convert capture files from one format to another. - (The same functions are available in Ethereal) + (The same functions are available in Wireshark) o Text2Pcap - a console, line-mode utility to generate a capture file from an ASCII hexdump of packets o Mergecap - a console, line-mode utility to merge two @@ -26,7 +26,7 @@ Additionally, the installation package contains a "plugins" option, which installs some additional dissector plugins for use with Ethereal and Tethereal. -All binaries in Ethereal package are now built with debugging +All binaries in Wireshark package are now built with debugging information embedded. If you are experiencing a crash when running Ethereal or other binaries, Dr. Watson or your debugger can use the information embedded in the binary to provide useful @@ -66,7 +66,7 @@ version , you will have to decide which applications to keep, since WinPcap 2.0/2.02 and later versions cannot be installed on the same system at the same time. -If Ethereal is not capturing packets and you have WinPcap installed, you +If Wireshark is not capturing packets and you have WinPcap installed, you can test your WinPcap installation by installing WinDump (tcpdump for Windows) ported by the same folks who make WinPcap. It's at: @@ -475,7 +475,7 @@ Problems with MS Visual C++ Version 7 / VC.NET ---------------------------------------------- Beside licensing problems with these compilers, there are known problems -with DLL's. If Ethereal is compiled with MSVC Version 7, there are +with DLL's. If Wireshark is compiled with MSVC Version 7, there are conflicts in the MSVCRT DLL's, The MSVCRT.DLL includes the standard ANSI-C functions like fopen, malloc, etc.. MSVCRT.DLL is shipped with the MSVC 6 compiler versions, and dynamically linked to prebuild DLL's @@ -565,7 +565,7 @@ To get it running, execute the following steps: Or you can start it from C:\cygwin\usr\X11R6\bin\startxwin.bat -8. Run ethereal (add /opt/gnome/bin to $PATH if this is not yet done) +8. Run wireshark (add /opt/gnome/bin to $PATH if this is not yet done) $ <ethereal-src>/ethereal diff --git a/acinclude.m4 b/acinclude.m4 index df4e712543..8a11f430b3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,5 +1,5 @@ dnl Macros that test for specific features. -dnl This file is part of the Autoconf packaging for Ethereal. +dnl This file is part of the Autoconf packaging for Wireshark. dnl Copyright (C) 1998-2000 by Gerald Combs. dnl dnl $Id$ diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index a6ed72e7ad..071b6a4ed0 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -1284,7 +1284,7 @@ process_prefs(void) } /* - * Cannot check if MIBS is already set, as it could be set by Ethereal. + * Cannot check if MIBS is already set, as it could be set by Wireshark. * * If we have a list of modules to load, put that list in MIBS, * otherwise clear MIBS. diff --git a/asn1/snmp/snmp.asn b/asn1/snmp/snmp.asn index 5626538d57..d9095666d3 100644 --- a/asn1/snmp/snmp.asn +++ b/asn1/snmp/snmp.asn @@ -52,7 +52,7 @@ SimpleSyntax ::= objectID-value ObjectID-value, empty Empty - -- Added from RFC 1155 for Ethereal + -- Added from RFC 1155 for Wireshark } String-value ::= OCTET STRING (SIZE (0..65535)) @@ -68,7 +68,7 @@ Integer32 ::= INTEGER (-2147483648..2147483647) ObjectID-value ::= OBJECT IDENTIFIER Empty ::= NULL - -- Added from RFC 1155 for Ethereal + -- Added from RFC 1155 for Wireshark -- application-wide types diff --git a/color_filters.c b/color_filters.c index 61f4a462ef..99343d389d 100644 --- a/color_filters.c +++ b/color_filters.c @@ -465,7 +465,7 @@ write_filters_file(FILE *f, gboolean only_marked) data.f = f; data.only_marked = only_marked; - fprintf(f,"# DO NOT EDIT THIS FILE! It was created by Ethereal\n"); + fprintf(f,"# DO NOT EDIT THIS FILE! It was created by Wireshark\n"); g_slist_foreach(color_filter_list, write_filter, &data); return TRUE; } diff --git a/colorfilters b/colorfilters index 2b8a4730be..5043523a13 100644 --- a/colorfilters +++ b/colorfilters @@ -1,4 +1,4 @@ -# DO NOT EDIT THIS FILE! It was created by Ethereal +# DO NOT EDIT THIS FILE! It was created by Wireshark @Bad TCP@tcp.analysis.flags@[0,0,0][65535,24383,24383] @HSRP State Change@hsrp.state != 8 && hsrp.state != 16@[0,0,0][65535,63222,0] @Spanning Tree Topology Change@stp.type == 0x80@[0,0,0][65535,63222,0] diff --git a/debian/changelog b/debian/changelog index bb293fcec2..5e49da253d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -291,13 +291,13 @@ ethereal (0.10.3-1) unstable; urgency=high (closes: #71994) * added another .desktop entry to start ethereal with gksu from Gnome menu * Upstream changes; libethereal and libwiretap handled differently; they may - end up in new packages (but go in ethereal-common for now) + end up in new packages (but go in wireshark-common for now) -- Frederic Peters <fpeters@debian.org> Sat, 27 Mar 2004 14:09:49 +0100 ethereal (0.10.2-2) unstable; urgency=low - * New files in ethereal-dev (closes: #236702) + * New files in wireshark-dev (closes: #236702) -- Frederic Peters <fpeters@debian.org> Sun, 7 Mar 2004 21:43:17 +0100 diff --git a/debian/control b/debian/control index fff1d04797..6eba8448b0 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Depends: ${shlibs:Depends} Recommends: ethereal (>= 0.9.1-3) | tethereal (>= 0.9.1-3) Conflicts: ethereal (<< 0.9.1-3), tethereal (<< 0.9.1-3) Description: network traffic analyser (common files) - Ethereal is a network traffic analyzer, or "sniffer", for Unix and + Wireshark is a network traffic analyzer, or "sniffer", for Unix and Unix-like operating systems. A sniffer is a tool used to capture packets off the wire. Ethereal decodes numerous protocols (too many to list). @@ -25,7 +25,7 @@ Architecture: any Depends: ${shlibs:Depends}, ethereal-common (= ${Source-Version}) Recommends: gksu Description: network traffic analyzer - Ethereal is a network traffic analyzer, or "sniffer", for Unix and + Wireshark is a network traffic analyzer, or "sniffer", for Unix and Unix-like operating systems. A sniffer is a tool used to capture packets off the wire. Ethereal decodes numerous protocols (too many to list). @@ -36,7 +36,7 @@ Package: tethereal Architecture: any Depends: ${shlibs:Depends}, ethereal-common (= ${Source-Version}) Description: network traffic analyzer (console) - Ethereal is a network traffic analyzer, or "sniffer", for Unix and + Wireshark is a network traffic analyzer, or "sniffer", for Unix and Unix-like operating systems. A sniffer is a tool used to capture packets off the wire. Ethereal decodes numerous protocols (too many to list). @@ -49,7 +49,7 @@ Architecture: any Section: devel Depends: ${shlibs:Depends}, omniidl (>> 1:3.0.4.1-10) | omniidl4 (>= 4.0.1-2) , libpcap0.8-dev, libtool, libglib2.0-dev, python, snacc, autotools-dev, debhelper, cdbs, automake1.7, autoconf Description: network traffic analyser (development tools) - Ethereal is a network traffic analyzer, or "sniffer", for Unix and + Wireshark is a network traffic analyzer, or "sniffer", for Unix and Unix-like operating systems. A sniffer is a tool used to capture packets off the wire. Ethereal decodes numerous protocols (too many to list). diff --git a/debian/patches/01_idl2deb.dpatch b/debian/patches/01_idl2deb.dpatch index 576af123de..e233204886 100644 --- a/debian/patches/01_idl2deb.dpatch +++ b/debian/patches/01_idl2deb.dpatch @@ -12,7 +12,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./idl2deb /tmp/dpep-work.K2bQz4/etherea +#!/usr/bin/env python + +# idl2deb - quick hack by W. Borgert <debacle@debian.org> to create -+# Debian GNU/Linux packages from idl2eth modules for Ethereal. ++# Debian GNU/Linux packages from idl2eth modules for Wireshark. +# Copyright 2003, W. Borgert + +# Makefile.am and configure.ac code by: diff --git a/debian/patches/02_asn2deb.dpatch b/debian/patches/02_asn2deb.dpatch index d4a0d39830..51e81c54b3 100644 --- a/debian/patches/02_asn2deb.dpatch +++ b/debian/patches/02_asn2deb.dpatch @@ -12,10 +12,10 @@ diff -urNad --exclude=CVS --exclude=.svn ./asn2deb /tmp/dpep-work.5BSR7A/etherea +#!/usr/bin/env python + +# asn2deb - quick hack by W. Borgert <debacle@debian.org> to create -+# Debian GNU/Linux packages from ASN.1 files for Ethereal. ++# Debian GNU/Linux packages from ASN.1 files for Wireshark. +# Copyright 2004, W. Borgert + -+# ASN.1 module for Ethereal, use of snacc type table: ++# ASN.1 module for Wireshark, use of snacc type table: +# Copyright 2003, Matthijs Melchior <matthijs.melchior@xs4all.nl> +# +# Wireshark - Network traffic analyzer diff --git a/debian/patches/09_idl2eth.dpatch b/debian/patches/09_idl2eth.dpatch index 9b29b179fa..4277d4d5b5 100644 --- a/debian/patches/09_idl2eth.dpatch +++ b/debian/patches/09_idl2eth.dpatch @@ -13,7 +13,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./idl2eth.sh /tmp/dpep-work.ZF6eGD/ethe fi -# --# Run ethereal backend, looking for ethereal_be.py and ethereal_gen.py +-# Run wireshark backend, looking for ethereal_be.py and ethereal_gen.py -# in pythons's "site-packages" directory. If cannot find that, then -# try looking in current directory. If still cannot, then exit with -# error. diff --git a/doc/Makefile.am b/doc/Makefile.am index 02b40ba716..153452e20b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am -# Automake file for Ethereal documentation +# Automake file for Wireshark documentation # # $Id$ # @@ -29,38 +29,38 @@ ethereal-tmp.pod: $(srcdir)/ethereal.pod $(top_builddir)/AUTHORS-SHORT-FORMAT ../ethereal.1: ethereal-tmp.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ ethereal-tmp.pod | sed 's/ETHEREAL-TMP/ETHEREAL/' > ../ethereal.1 ../ethereal.html: ethereal-tmp.pod ../config.h $(POD2HTML) \ - --title="The Ethereal Network Analyzer $(VERSION)" \ + --title="The Wireshark Network Analyzer $(VERSION)" \ --noindex \ ethereal-tmp.pod > ../ethereal.html ../tethereal.1: tethereal.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ $(srcdir)/tethereal.pod > ../tethereal.1 ../tethereal.html: tethereal.pod ../config.h $(POD2HTML) \ - --title="tethereal - The Ethereal Network Analyzer $(VERSION)" \ + --title="tethereal - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ $(srcdir)/tethereal.pod > ../tethereal.html ../ethereal-filter.4: ethereal-filter.pod ../config.h $(POD2MAN) \ --section=4 \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ ethereal-filter.pod > ../ethereal-filter.4 ../ethereal-filter.html: ethereal-filter.pod ../config.h $(POD2HTML) \ - --title="ethereal-filter - The Ethereal Network Analyzer $(VERSION)" \ + --title="ethereal-filter - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ ethereal-filter.pod > ../ethereal-filter.html @@ -69,73 +69,73 @@ ethereal-filter.pod: ethereal-filter.pod.template ../tethereal ../capinfos.1: capinfos.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ $(srcdir)/capinfos.pod > ../capinfos.1 ../capinfos.html: capinfos.pod ../config.h $(POD2HTML) \ - --title="capinfos - The Ethereal Network Analyzer $(VERSION)" \ + --title="capinfos - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ $(srcdir)/capinfos.pod > ../capinfos.html ../editcap.1: editcap.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ $(srcdir)/editcap.pod > ../editcap.1 ../editcap.html: editcap.pod ../config.h $(POD2HTML) \ - --title="editcap - The Ethereal Network Analyzer $(VERSION)" \ + --title="editcap - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ $(srcdir)/editcap.pod > ../editcap.html ../idl2eth.1: idl2eth.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ $(srcdir)/idl2eth.pod > ../idl2eth.1 ../idl2eth.html: idl2eth.pod ../config.h $(POD2HTML) \ - --title="idl2eth - The Ethereal Network Analyzer $(VERSION)" \ + --title="idl2eth - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ $(srcdir)/idl2eth.pod > ../idl2eth.html ../mergecap.1: mergecap.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ $(srcdir)/mergecap.pod > ../mergecap.1 ../mergecap.html: mergecap.pod ../config.h $(POD2HTML) \ - --title="mergecap - The Ethereal Network Analyzer $(VERSION)" \ + --title="mergecap - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ $(srcdir)/mergecap.pod > ../mergecap.html ../text2pcap.1: text2pcap.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ $(srcdir)/text2pcap.pod > ../text2pcap.1 ../text2pcap.html: text2pcap.pod ../config.h $(POD2HTML) \ - --title="text2pcap - The Ethereal Network Analyzer $(VERSION)" \ + --title="text2pcap - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ $(srcdir)/text2pcap.pod > ../text2pcap.html ../dumpcap.1: dumpcap.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ $(srcdir)/dumpcap.pod > ../dumpcap.1 ../dumpcap.html: dumpcap.pod ../config.h $(POD2HTML) \ - --title="dumpcap - The Ethereal Network Analyzer $(VERSION)" \ + --title="dumpcap - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ $(srcdir)/dumpcap.pod > ../dumpcap.html diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake index e44d45d4ac..941893c721 100644 --- a/doc/Makefile.nmake +++ b/doc/Makefile.nmake @@ -1,5 +1,5 @@ # Makefile.nmake -# Nmake file for Ethereal documentation +# Nmake file for Wireshark documentation # # $Id$ # @@ -42,13 +42,13 @@ ethereal-tmp.pod: ethereal.pod ../AUTHORS-SHORT-FORMAT ethereal.1: ethereal.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ ethereal-tmp.pod > ethereal.1 ethereal.html: ethereal-tmp.pod ../config.h $(POD2HTML) \ - --title="The Ethereal Network Analyzer $(VERSION)" \ + --title="The Wireshark Network Analyzer $(VERSION)" \ --noindex \ ethereal-tmp.pod > ethereal.html @@ -59,25 +59,25 @@ ethereal.html: ethereal-tmp.pod ../config.h tethereal.1: tethereal.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ tethereal.pod > tethereal.1 tethereal.html: tethereal.pod ../config.h $(POD2HTML) \ - --title="tethereal - The Ethereal Network Analyzer $(VERSION)" \ + --title="tethereal - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ tethereal.pod > tethereal.html ethereal-filter.4: ethereal-filter.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ ethereal-filter.pod > ethereal.4 ethereal-filter.html: ethereal-filter.pod ../config.h $(POD2HTML) \ - --title="ethereal-filter - The Ethereal Network Analyzer $(VERSION)" \ + --title="ethereal-filter - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ ethereal-filter.pod > ethereal-filter.html @@ -90,74 +90,74 @@ ethereal-filter.pod: ethereal-filter.pod.template ../tethereal.exe capinfos.1: capinfos.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ capinfos.pod > capinfos.1 capinfos.html: capinfos.pod ../config.h $(POD2HTML) \ - --title="capinfos - The Ethereal Network Analyzer $(VERSION)" \ + --title="capinfos - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ capinfos.pod > capinfos.html editcap.1: editcap.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ editcap.pod > editcap.1 editcap.html: editcap.pod ../config.h $(POD2HTML) \ - --title="editcap - The Ethereal Network Analyzer $(VERSION)" \ + --title="editcap - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ editcap.pod > editcap.html idl2eth.1: idl2eth.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ idl2eth.pod > idl2eth.1 idl2eth.html: idl2eth.pod ../config.h $(POD2HTML) \ - --title="idl2eth - The Ethereal Network Analyzer $(VERSION)" \ + --title="idl2eth - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ idl2eth.pod > idl2eth.html mergecap.1: mergecap.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ mergecap.pod > mergecap.1 mergecap.html: mergecap.pod ../config.h $(POD2HTML) \ - --title="mergecap - The Ethereal Network Analyzer $(VERSION)" \ + --title="mergecap - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ mergecap.pod > mergecap.html text2pcap.1: text2pcap.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ text2pcap.pod > text2pcap.1 text2pcap.html: text2pcap.pod ../config.h $(POD2HTML) \ - --title="text2pcap - The Ethereal Network Analyzer $(VERSION)" \ + --title="text2pcap - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ text2pcap.pod > text2pcap.html dumpcap.1: dumpcap.pod ../config.h $(POD2MAN) \ - --center="The Ethereal Network Analyzer" \ + --center="The Wireshark Network Analyzer" \ --release=$(VERSION) \ dumpcap.pod > dumpcap.1 dumpcap.html: dumpcap.pod ../config.h $(POD2HTML) \ - --title="dumpcap - The Ethereal Network Analyzer $(VERSION)" \ + --title="dumpcap - The Wireshark Network Analyzer $(VERSION)" \ --noindex \ dumpcap.pod > dumpcap.html diff --git a/doc/README.binarytrees b/doc/README.binarytrees index dba93db76b..c5c039a6d3 100644 --- a/doc/README.binarytrees +++ b/doc/README.binarytrees @@ -17,7 +17,7 @@ Ethereal provides its own version of red black binary trees designed in particular to be easy to use and to eliminate most of the memory management often associated with such trees. -The trees supported by ethereal are currently all created using SEasonal +The trees supported by wireshark are currently all created using SEasonal storage which means that when you load a new trace into ethereal, the SEasonal memory management will automatically release every single byte of data associated with the tree. diff --git a/doc/README.developer b/doc/README.developer index fcb50db1c6..ce2c00d66e 100644 --- a/doc/README.developer +++ b/doc/README.developer @@ -1,6 +1,6 @@ $Id$ -This file is a HOWTO for Ethereal developers. It describes how to start coding +This file is a HOWTO for Wireshark developers. It describes how to start coding a Ethereal protocol dissector and the use some of the important functions and variables. @@ -144,7 +144,7 @@ and dereferencing that pointer. That point won't necessarily be aligned on the proper boundary, which can cause crashes on some platforms (even if it doesn't crash on an x86-based PC); furthermore, the data in a packet is not necessarily in the byte order of the machine on which -Ethereal is running. Use the tvbuff routines to extract individual +Wireshark is running. Use the tvbuff routines to extract individual items from the packet, or use "proto_tree_add_item()" and let it extract the items for you. @@ -299,7 +299,7 @@ Ethereal supports both platforms with GLib 1.2[.x]/GTK+ 1.2[.x] and GLib 2.x/GTK+ 1.3[.x] and 2.x. If at all possible, either use only mechanisms that are present in GLib 1.2[.x] and GTK+ 1.2[.x], use #if's to conditionally use older or newer mechanisms depending on the platform -on which Ethereal is being built, or, if the code in GLib or GTK+ that +on which Wireshark is being built, or, if the code in GLib or GTK+ that implements that mechanism will build with GLib 1.2[.x]/GTK+ 1.2[.x], conditionally include that code as part of the Ethereal source and use the included version with GLib 1.2[.x] or GTK+ 1.2[.x]. In particular, @@ -311,7 +311,7 @@ also work with GLib 1.2[.x] and GTK+ 1.2[.x]. When different code must be used on UN*X and Win32, use a #if or #ifdef that tests _WIN32, not WIN32. Try to write code portably whenever -possible, however; note that there are some routines in Ethereal with +possible, however; note that there are some routines in Wireshark with platform-dependent implementations and platform-independent APIs, such as the routines in epan/filesystem.c, allowing the code that calls it to be written portably without #ifdefs. @@ -380,8 +380,8 @@ Please read README.malloc . 1.1.3 Robustness. -Ethereal is not guaranteed to read only network traces that contain correctly- -formed packets. Ethereal is commonly used is to track down networking problems, +Wireshark is not guaranteed to read only network traces that contain correctly- +formed packets. Wireshark is commonly used is to track down networking problems, and the problems might be due to a buggy protocol implementation sending out bad packets. @@ -523,7 +523,7 @@ Avoid using tab expansions different from 8 spaces, as not all text editors in use by the developers support this. When creating a new file, you are free to choose an indentation logic. Most of -the files in Ethereal tend to use 2-space or 4-space indentation. You are +the files in Wireshark tend to use 2-space or 4-space indentation. You are encouraged to write a short comment on the indentation logic at the beginning of this new file. @@ -689,14 +689,14 @@ dissect_PROTOABBREV(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (a) Operational dissection - In this mode, Ethereal is only interested in the way protocols + In this mode, Wireshark is only interested in the way protocols interact, protocol conversations are created, packets are reassembled and handed over to higher-level protocol dissectors. In this mode Ethereal does not build a so-called "protocol tree". (b) Detailed dissection - In this mode, Ethereal is also interested in all details of a given + In this mode, Wireshark is also interested in all details of a given protocol, so a "protocol tree" is created. Ethereal distinguishes between the 2 modes with the proto_tree pointer: @@ -2725,7 +2725,7 @@ whether it is registered to our protocol or not. We should do this because is uncommon but it does happen that multiple different protocols can use the same socketpair during different stages of an application cycle. By keeping track of the frame number a conversation -was started in ethereal can still tell these different protocols apart. +was started in wireshark can still tell these different protocols apart. The second argument to conversation_set_dissector is a dissector handle, which is created with a call to create_dissector_handle or diff --git a/doc/README.packaging b/doc/README.packaging index 6e199a7390..df866a03c0 100644 --- a/doc/README.packaging +++ b/doc/README.packaging @@ -10,9 +10,9 @@ distributing a software package containing Ethereal: If your packaging system downloads a copy of the Ethereal sources, use this location. -2. The Ethereal web site URL is http://www.ethereal.com/ . +2. The Wireshark web site URL is http://www.ethereal.com/ . -3. Ethereal is released under the GNU General Public License. Make sure +3. Wireshark is released under the GNU General Public License. Make sure your package complies with this license, or we send in the marmots. 4. Ethereal and the "e" logo are registered trademarks of Ethereal, Inc. diff --git a/doc/README.tapping b/doc/README.tapping index 328bbade3f..2347716dbb 100644 --- a/doc/README.tapping +++ b/doc/README.tapping @@ -1,6 +1,6 @@ $Id$ -The TAP system in ethereal is a powerful and flexible mechanism to get event +The TAP system in wireshark is a powerful and flexible mechanism to get event driven notification on packets matching certain protocols and/or filters. In order to use the tapping system, very little knowledge of ethereal internals are required. diff --git a/doc/README.xml-output b/doc/README.xml-output index 154b3940ab..5af7e80cde 100644 --- a/doc/README.xml-output +++ b/doc/README.xml-output @@ -32,7 +32,7 @@ It causes Analyzer to crash. As such, the PDML that ethereal produces is be labled with a version number of "0", which means that the PDML does not fully follow the PDML spec. Furthemore, a creator attribute in the "<pdml>" tag gives the version number of [t]ethereal that produced the PDML. -In that way, as the PDML produced by ethereal matures, but still does not +In that way, as the PDML produced by wireshark matures, but still does not meet the PDML spec, scripts can make intelligent decisions about how to best parse the PDML, based on the "creator" attribute. @@ -93,7 +93,7 @@ a field with a field-name. Those appear in PDML as "<field>" tags with no Many dissectors label the undissected payload of a protocol as belonging to a "data" protocol, and the "data" protocol usually resided inside that last protocol dissected. In the PDML, The "data" protocol becomes -a "data" field, placed exactly where the "data" protocol is in ethereal's +a "data" field, placed exactly where the "data" protocol is in wireshark's protocol tree. So, if ethereal would normally show: +-- Frame diff --git a/doc/ethereal.pod b/doc/ethereal.pod index 8acfdc7983..674c20c069 100644 --- a/doc/ethereal.pod +++ b/doc/ethereal.pod @@ -1512,13 +1512,13 @@ item can be set to use either inverse video, or bold characters. =item Save Window Position -If this item is selected, the position of the main Ethereal window will -be saved when Ethereal exits, and used when Ethereal is started again. +If this item is selected, the position of the main Wireshark window will +be saved when Ethereal exits, and used when Wireshark is started again. =item Save Window Size -If this item is selected, the size of the main Ethereal window will -be saved when Ethereal exits, and used when Ethereal is started again. +If this item is selected, the size of the main Wireshark window will +be saved when Ethereal exits, and used when Wireshark is started again. =item File Open Dialog Behavior @@ -1879,7 +1879,7 @@ you specify that Ethereal should stop capturing after the file to which captured packets are being saved grows as large as or larger than some specified number of megabytes. If the check box is not checked, Ethereal will not stop capturing at some capture file size (although the operating -system on which Ethereal is running, or the available disk space, may still +system on which Wireshark is running, or the available disk space, may still limit the maximum size of a capture file). This option is disabled, if "multiple files" mode is used, @@ -2011,7 +2011,7 @@ The settings in this file have the same format as in the F<preferences> files, and the same directory as for the personal preferences file is used. -Note: Whenever Ethereal is closed, your recent file +Note: Whenever Wireshark is closed, your recent file will be overwritten with the new settings, destroying any comments and unknown/obsolete settings that were in the file. diff --git a/docbook/developer-guide.xml b/docbook/developer-guide.xml index 9d1ee2ff8e..7ff948594d 100644 --- a/docbook/developer-guide.xml +++ b/docbook/developer-guide.xml @@ -28,7 +28,7 @@ DOCUMENT SECTION --> <!ENTITY DocumentTitle "<application>Ethereal</application> Developer's Guide"> - <!ENTITY DocumentSubTitle "&SvnVersion; for Ethereal &EtherealCurrentVersion;"> + <!ENTITY DocumentSubTitle "&SvnVersion; for Wireshark &EtherealCurrentVersion;"> <!ENTITY DocumentTitleAbbreviation "EDG"> <!ENTITY DocumentCopyrightHolder "Ulf Lamping"> diff --git a/docbook/edg_src/EDG_chapter_build_intro.xml b/docbook/edg_src/EDG_chapter_build_intro.xml index ecf075d459..f030b75b91 100644 --- a/docbook/edg_src/EDG_chapter_build_intro.xml +++ b/docbook/edg_src/EDG_chapter_build_intro.xml @@ -38,7 +38,7 @@ <section id="ChCodeStyle"> <title>Coding styleguides</title> <para> - The coding styleguides for Ethereal can be found in the "Code style" + The coding styleguides for Wireshark can be found in the "Code style" section of the file <filename>doc/README.developer</filename>. </para> </section> diff --git a/docbook/edg_src/EDG_chapter_env_intro.xml b/docbook/edg_src/EDG_chapter_env_intro.xml index b812ef2e37..91864e1255 100644 --- a/docbook/edg_src/EDG_chapter_env_intro.xml +++ b/docbook/edg_src/EDG_chapter_env_intro.xml @@ -16,7 +16,7 @@ <title>What is <application>Ethereal?</application></title> <para> Well, if you want to start Ethereal development, you might already - know what Ethereal is doing. If not, please have a look at the + know what Wireshark is doing. If not, please have a look at the <ulink url="&EtherealUsersGuidePage;">Ethereal User's Guide</ulink>, which will provide a lot of general information about it. </para> @@ -31,7 +31,7 @@ order to run. </para> <para> - As Ethereal is developed in a platform independant way and uses libraries + As Wireshark is developed in a platform independant way and uses libraries which are available for a lot of different platforms (such as the GTK+ GUI library), it's available on a such a wide variety of platforms. </para> @@ -104,7 +104,7 @@ </title> <para> Ethereal was initially developed by Gerald Combs. Ongoing development - and maintenance of Ethereal is handled by the Ethereal team, a loose + and maintenance of Wireshark is handled by the Ethereal team, a loose group of individuals who fix bugs and provide new functionality. </para> <para> @@ -131,13 +131,13 @@ <section><title>Programming language(s) used</title> <para> - Almost any part of Ethereal is implemented in plain ANSI C. + Almost any part of Wireshark is implemented in plain ANSI C. </para> <para> The typical task for a new Ethereal developer is to extend an existing, or write a new dissector for a specific network protocol. As (almost) any dissector is written in plain old ANSI C, a good knowledge about ANSI C - will be sufficient for Ethereal development in almost any case. + will be sufficient for Wireshark development in almost any case. </para> <para> So unless you are going to change the development process of Ethereal @@ -149,7 +149,7 @@ Beside the usual tools for developing a program in C (compiler, make, ...), the build process uses some additional helper tools (Perl, Python, Sed, ...), which are needed for the build process and in the case Ethereal - should be installed from the released source packages. If Ethereal is + should be installed from the released source packages. If Wireshark is installed from a binary package, none of these helper tools are needed on the target system. </para> @@ -158,7 +158,7 @@ <section><title>Open Source Software</title> <para> - Ethereal is an open source software project, and is released under + Wireshark is an open source software project, and is released under the <ulink url="&GPLWebsite;">GNU General Public Licence</ulink> (GPL). You can freely use Ethereal on any number of computers you like, without worrying about license keys or fees or such. In addition, all source @@ -195,7 +195,7 @@ The maintainers and developers of Ethereal will maintain your code as well, fixing it when API changes or other changes are made, and generally keeping it in tune with what is happening - with Ethereal. So if Ethereal is updated (which is done often), + with Ethereal. So if Wireshark is updated (which is done often), you can get a new Ethereal version from the website and your changes will already be included without any effort for you. </para> @@ -203,7 +203,7 @@ </itemizedlist> </para> <para> - The Ethereal source code and binary kits for some platforms are all + The Wireshark source code and binary kits for some platforms are all available on the download page of the Ethereal website: <ulink url="&EtherealDownloadPage;">&EtherealDownloadPage;</ulink>. </para> @@ -312,7 +312,7 @@ <section id="ChIntroWiki"><title>Wiki</title> <para> - The Ethereal Wiki at <ulink + The Wireshark Wiki at <ulink url="&EtherealWikiSite;">&EtherealWikiSite;</ulink> provides a wide range of information related to Ethereal and packet capturing in general. You will find a lot of information not part of this developer's guide. For @@ -373,7 +373,7 @@ <varlistentry><term><command>ethereal-dev</command></term> <listitem> <para> - This list is for Ethereal developers. People post questions about + This list is for Wireshark developers. People post questions about the development of Ethereal, others (hopefully) provide answers. If you want to start developing a protocol dissector, join this list. </para> @@ -382,7 +382,7 @@ <varlistentry><term><command>ethereal-bugs</command></term> <listitem> <para> - This list is for Ethereal developers. Everytime a change to the bug + This list is for Wireshark developers. Everytime a change to the bug database occurs, a mail to this mailing list is generated. If you want to be notified about all the changes to the bug database, join this list. Details about the bug database can be @@ -393,7 +393,7 @@ <varlistentry><term><command>ethereal-cvs</command></term> <listitem> <para> - This list is for Ethereal developers. Everytime a change to the SVN + This list is for Wireshark developers. Everytime a change to the SVN repository is checked in, a mail to this mailing list is generated. If you want to be notified about all the changes to the SVN repository, join this list. Details about the SVN repository can be diff --git a/docbook/edg_src/EDG_chapter_libraries.xml b/docbook/edg_src/EDG_chapter_libraries.xml index e1eb2d9ee2..460d90e92a 100644 --- a/docbook/edg_src/EDG_chapter_libraries.xml +++ b/docbook/edg_src/EDG_chapter_libraries.xml @@ -81,7 +81,7 @@ <title>Win32: cygwin gcc</title> <para> Cygwin provides most of the required libraries (with file extension .a/.lib) - for Ethereal suitable for cygwin's gcc compiler. + for Wireshark suitable for cygwin's gcc compiler. </para> </section> </section> diff --git a/docbook/edg_src/EDG_chapter_sources.xml b/docbook/edg_src/EDG_chapter_sources.xml index 7243756702..6fa741978a 100644 --- a/docbook/edg_src/EDG_chapter_sources.xml +++ b/docbook/edg_src/EDG_chapter_sources.xml @@ -30,10 +30,10 @@ </section> <section id="ChSrcSVNServer"> - <title>The Ethereal Subversion repository</title> + <title>The Wireshark Subversion repository</title> <para> Subversion is used to keep track of the changes made to the Ethereal - source code. The Ethereal source code is stored inside Ethereal project's + source code. The Wireshark source code is stored inside Ethereal project's Subversion repository located at a server at the ethereal.com domain. </para> <para> @@ -338,7 +338,7 @@ <para> So after obtaining the sources, tools and libraries, the first place to look at is <filename>doc/README.developer</filename>, - here you will get the latest infos for Ethereal development for all + here you will get the latest infos for Wireshark development for all supported platforms. </para> <tip><title>Tip!</title> @@ -502,7 +502,7 @@ make <listitem><para> The maintainers and developers of Ethereal will maintain your code as well, fixing it when API changes or other changes are made, and generally - keeping it in tune with what is happening with Ethereal. So if Ethereal is + keeping it in tune with what is happening with Ethereal. So if Wireshark is updated (which is done often), you can get a new Ethereal version from the website and your changes will already be included without any effort for you. The maintainers and developers of Ethereal will maintain your @@ -531,7 +531,7 @@ make </tip> </para> <para> - The Ethereal community is using patches to transfer source code changes + The Wireshark community is using patches to transfer source code changes between the authors. </para> <para> @@ -559,7 +559,7 @@ diff -ur ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/pa sign indicates a deleted line compared to the original sources. </para> <para> - As we always use so called "unified" diff files in Ethereal development, + As we always use so called "unified" diff files in Wireshark development, three unchanged lines before and after the actual changed parts are included. This will make it much easier for a merge/patch tool to find the right place(s) to change in the existing sources. @@ -768,7 +768,7 @@ diff -ur ../ethereal-0.10.6/epan/dissectors/packet-dcerpc.c ./epan/dissectors/pa <listitem><para> <command>Follow the Ethereal source code style guide.</command> Just because something compiles on your platform, that doesn't - mean it'll compile on all of the other platforms for which Ethereal is + mean it'll compile on all of the other platforms for which Wireshark is built. Ethereal runs on many platforms, and can be compiled with a number of different compilers. See <xref linkend="ChCodeStyle"/> for details. diff --git a/docbook/edg_src/EDG_chapter_tools.xml b/docbook/edg_src/EDG_chapter_tools.xml index 8f9e15693d..1358ccdacb 100644 --- a/docbook/edg_src/EDG_chapter_tools.xml +++ b/docbook/edg_src/EDG_chapter_tools.xml @@ -7,7 +7,7 @@ <title>Introduction</title> <para> This chapter will provide you with information how to install - the various tools needed for Ethereal development. + the various tools needed for Wireshark development. </para> <para> None of the tools mentioned in this chapter is needed to run Ethereal, @@ -931,7 +931,7 @@ Built 18:08:02 Feb 4 2003 <title>sed</title> <para> Sed it the streaming editor. It makes it easy for example to replace - specially marked texts inside a source code file. The Ethereal build + specially marked texts inside a source code file. The Wireshark build process uses this to stamp version strings into various places. </para> @@ -1073,7 +1073,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.]]> <section id="ChToolsSubversion"> <title>Subversion (SVN) client (optional)</title> <para> - The Ethereal project uses it's own subversion (or short SVN) server to keep + The Wireshark project uses it's own subversion (or short SVN) server to keep track of all the changes done to the source code. Details about the usage of subversion in the Ethereal project can be found in <xref linkend="ChSrcSVNServer"/>. diff --git a/docbook/edg_src/EDG_chapter_userinterface.xml b/docbook/edg_src/EDG_chapter_userinterface.xml index 477b978e47..e526418df5 100644 --- a/docbook/edg_src/EDG_chapter_userinterface.xml +++ b/docbook/edg_src/EDG_chapter_userinterface.xml @@ -48,7 +48,7 @@ <section id="ChUIGTK"> <title>The GTK library</title> <para> - Ethereal is based on the GTK toolkit, see: <ulink url="http://www.gtk.org"/> + Wireshark is based on the GTK toolkit, see: <ulink url="http://www.gtk.org"/> for details. GTK is designed to hide the details of the underlying GUI in a platform independant way. As this is appreciated for a @@ -69,7 +69,7 @@ <para> There are other similar toolkits like Qt, wxwidgets, ..., which could also - be used for Ethereal. There's no "one and only" reason for or against + be used for Wireshark. There's no "one and only" reason for or against any of these toolkits. However, the decision towards GTK was made a long time ago :-) </para> @@ -203,7 +203,7 @@ gtk.h headers. </para> <para> - There are some common compatibility issues in Ethereal between the two + There are some common compatibility issues in Wireshark between the two versions. </para> <para> @@ -232,7 +232,7 @@ <para> First of all, have a look at: <ulink url="http://www.gtk.org"/> as this will be the first place to look at. If you want to develop GTK related - things for Ethereal, the most important place might + things for Wireshark, the most important place might be the GTK API documentation at: <ulink url="http://gtk.org/api/"/>. </para> <para> @@ -261,7 +261,7 @@ <section id="ChUIGUIDocs"> <title>GUI Reference documents</title> <para> - Although the GUI development of Ethereal is platform independant, the + Although the GUI development of Wireshark is platform independant, the Ethereal development team tries to follow the GNOME Human Interface Guidelines (HIG) where appropriate. This is the case, because both GNOME and Ethereal are based on the GTK+ diff --git a/docbook/edg_src/EDG_chapter_works.xml b/docbook/edg_src/EDG_chapter_works.xml index 48d78a8baa..b657ddc2f9 100644 --- a/docbook/edg_src/EDG_chapter_works.xml +++ b/docbook/edg_src/EDG_chapter_works.xml @@ -7,7 +7,7 @@ <section id="ChWorksIntro"> <title>Introduction</title> <para> - This chapter will give you a short overview, how Ethereal is working. + This chapter will give you a short overview, how Wireshark is working. </para> </section> @@ -137,7 +137,7 @@ <section id="ChWorksDissectPackets"> <title>Dissect packets</title> <para> - While Ethereal is loading packets from a file, each packet is dissected. + While Wireshark is loading packets from a file, each packet is dissected. Ethereal tries to detect what kind of packet it is and getting as much information from it as possible. In this run, only the information showed in the packet list pane is needed though. diff --git a/docbook/eug_src/EUG_app_files.xml b/docbook/eug_src/EUG_app_files.xml index 8658947dce..bf992c7dc7 100644 --- a/docbook/eug_src/EUG_app_files.xml +++ b/docbook/eug_src/EUG_app_files.xml @@ -235,7 +235,7 @@ udp </term> <listitem> <para> - When Ethereal is trying to translate Ethernet hardware + When Wireshark is trying to translate Ethernet hardware addresses to names, it consults the files listed in <xref linkend="AppFilesTabFolders"/>. If an address is not found in /etc/ethers, @@ -252,7 +252,7 @@ c0-00-ff-ff-ff-ff TR_broadcast 00.2b.08.93.4b.a1 Freds_machine </programlisting> The settings from this file are read in at program start and never - written by Ethereal. + written by Wireshark. </para> </listitem> </varlistentry> @@ -273,7 +273,7 @@ c0-00-ff-ff-ff-ff TR_broadcast </para> <para> The settings from this file are read in at program start and never - written by Ethereal. + written by Wireshark. </para> </listitem> </varlistentry> @@ -296,7 +296,7 @@ c0-00-ff-ff-ff-ff TR_broadcast </para> <para> The settings from this file are read in at program start and never - written by Ethereal. + written by Wireshark. </para> </listitem> </varlistentry> @@ -318,7 +318,7 @@ c0-a8-1c-00 CEO </para> <para> The settings from this file are read in at program start and never - written by Ethereal. + written by Wireshark. </para> </listitem> </varlistentry> @@ -347,7 +347,7 @@ c0-a8-1c-00 CEO <section id="ChWindowsFolder"><title>Windows folders</title> <para> - Here you will find some details about the folders used in Ethereal + Here you will find some details about the folders used in Wireshark on different Windows versions. </para> <para> @@ -371,7 +371,7 @@ c0-a8-1c-00 CEO </note> <para> The following will try to guide - you to the right place where to look for Ethereals profile data. + you to the right place where to look for Wiresharks profile data. </para> <para> <variablelist> @@ -427,7 +427,7 @@ c0-a8-1c-00 CEO you are currently working on, but on the domain server. </para> <para> - As Ethereal is using the correct places to store it's profile data, + As Wireshark is using the correct places to store it's profile data, your settings will travel with you, if you logon to a different computer the next time. </para> diff --git a/docbook/eug_src/EUG_app_messages.xml b/docbook/eug_src/EUG_app_messages.xml index 752014864b..a0631e7d2a 100644 --- a/docbook/eug_src/EUG_app_messages.xml +++ b/docbook/eug_src/EUG_app_messages.xml @@ -6,7 +6,7 @@ <para> Ethereal provides you with additional information generated out of the plain packet data or it may need to indicate dissection problems. - Messages generated by Ethereal are usually placed in [] parentheses. + Messages generated by Wireshark are usually placed in [] parentheses. </para> <section id="AppMessagesList"><title>Packet List Messages</title> <para> diff --git a/docbook/eug_src/EUG_app_tools.xml b/docbook/eug_src/EUG_app_tools.xml index 27e2dc729e..0338684781 100644 --- a/docbook/eug_src/EUG_app_tools.xml +++ b/docbook/eug_src/EUG_app_tools.xml @@ -65,7 +65,7 @@ tcpdump -i <interface> -s 1500 -w <some-file> <title><command>capinfos</command>: Print information about capture files </title> <para> - Included with Ethereal is a small utility called + Included with Wireshark is a small utility called <command>capinfos</command>, which is a command-line utility to print information about binary capture files. </para> @@ -98,7 +98,7 @@ Usage: capinfos [-t] [-c] [-s] [-d] [-u] [-a] [-e] [-y] <section id="AppToolseditcap"> <title><command>editcap</command>: Edit capture files</title> <para> - Included with Ethereal is a small utility called + Included with Wireshark is a small utility called <command>editcap</command>, which is a command-line utility for working with capture files. Its main function is to remove packets from capture files, but it can also be used to convert diff --git a/docbook/eug_src/EUG_chapter_advanced.xml b/docbook/eug_src/EUG_chapter_advanced.xml index cd9bcbcddc..6a7a33b4e6 100644 --- a/docbook/eug_src/EUG_chapter_advanced.xml +++ b/docbook/eug_src/EUG_chapter_advanced.xml @@ -184,7 +184,7 @@ time stamp precision itself (whatever the benefit may be). </para> <para> - The common libpcap capture file format that is used by Ethereal (and a + The common libpcap capture file format that is used by Wireshark (and a lot of other tools) supports a fixed microsecond resolution "0.123456" only. </para> @@ -201,7 +201,7 @@ </section> <section><title>Accuracy</title> <para> - It's often asked: "Which time stamp accuracy is provided by Ethereal?". + It's often asked: "Which time stamp accuracy is provided by Wireshark?". Well, Ethereal doesn't create any time stamps itself but simply get's them from "somewhere else" and displays them. So accuracy will depend on the capture system (operating system, performance, ...) that you use. @@ -371,7 +371,7 @@ UN*X systems, and "Windows NT based" systems (Windows NT 4.0, Windows 2000, Windows XP, Windows Server 2003, Windows Vista) represent time internally as UTC. - When Ethereal is capturing, no conversion is necessary. + When Wireshark is capturing, no conversion is necessary. However, if the system time zone is not set correctly, the system's UTC time might not be correctly set even if the system clock appears to display correct local time. @@ -604,7 +604,7 @@ <para> <command>Name resolution will often fail.</command> The name to be resolved might simply be unknown by the name servers asked or the servers - are just not available and the name is also not found in Ethereal's + are just not available and the name is also not found in Wireshark's configuration files. </para> </listitem> @@ -630,12 +630,12 @@ </listitem> <listitem> <para> - <command>Resolved DNS names are cached by Ethereal.</command> + <command>Resolved DNS names are cached by Wireshark.</command> This is required for acceptable performance. However, if the name resolution information - should change while Ethereal is running, + should change while Wireshark is running, Ethereal won't notice a change to the name resolution information once - it's get cached. If this information changes while Ethereal is running, + it's get cached. If this information changes while Wireshark is running, e.g. a new DHCP lease takes effect, Ethereal won't notice it. XXX - is this true for all or only for DNS info? </para> diff --git a/docbook/eug_src/EUG_chapter_build_install.xml b/docbook/eug_src/EUG_chapter_build_install.xml index 91381c540d..8797483fc2 100644 --- a/docbook/eug_src/EUG_chapter_build_install.xml +++ b/docbook/eug_src/EUG_chapter_build_install.xml @@ -467,7 +467,7 @@ apt-get install ethereal <note><title>Note!</title> <para> <command>Since Ethereal Version 0.10.12, the WinPcap installer has become - part of the main Ethereal installer, so you don't need to download and + part of the main Wireshark installer, so you don't need to download and install two separate packages any longer!</command> </para> </note> @@ -542,11 +542,11 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P (both Ethereal GTK1 and 2 cannot be installed at the same time): <itemizedlist> <listitem><para> - <command>Etheral GTK1</command> - Ethereal is a GUI network protocol + <command>Etheral GTK1</command> - Wireshark is a GUI network protocol analyzer. </para></listitem> <listitem><para> - <command>Etheral GTK2</command> - Ethereal is a GUI network protocol + <command>Etheral GTK2</command> - Wireshark is a GUI network protocol analyzer (using the modern GTK2 GUI toolkit, recommended). </para></listitem> <listitem><para> @@ -558,7 +558,7 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P protocol analyzer. </para></listitem> </itemizedlist> - The dissection extensions for Ethereal and Tethereal: + The dissection extensions for Wireshark and Tethereal: <itemizedlist> <listitem><para> <command>Dissector Plugins</command> - Plugins with some extended dissections. @@ -686,13 +686,13 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P <title>Update Ethereal</title> <para> From time to time you may want to update your installed Ethereal to a more - recent version. If you join Ethereal's announce mailing list, you will be + recent version. If you join Wireshark's announce mailing list, you will be informed about new Ethereal versions, see <xref linkend="ChIntroMailingLists"/> for details how to subscribe to this list. </para> <para> New versions of Ethereal usually become available every 4-8 weeks. - Updating Ethereal is done the same way as installing it, you simply + Updating Wireshark is done the same way as installing it, you simply download and start the installer exe. A reboot is usually not required and all your personal settings remain unchanged. </para> @@ -723,7 +723,7 @@ ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\P start the uninstallation procedure. </para> <para> - The Ethereal uninstaller will provide several options which things to be + The Wireshark uninstaller will provide several options which things to be uninstalled, the default is to remove the core components but keep the personal settings, WinPcap and alike. </para> diff --git a/docbook/eug_src/EUG_chapter_capture.xml b/docbook/eug_src/EUG_chapter_capture.xml index 6bea52335a..ed8a3c3e08 100644 --- a/docbook/eug_src/EUG_chapter_capture.xml +++ b/docbook/eug_src/EUG_chapter_capture.xml @@ -10,7 +10,7 @@ Capturing live network data is one of the major features of Ethereal. </para> <para> - The Ethereal capture engine provides the following features: + The Wireshark capture engine provides the following features: </para> <para> <itemizedlist> @@ -581,7 +581,7 @@ ethereal -i eth0 -k <para> While capturing, the underlying libpcap capturing engine will grab the packets from the network card and keep the packet data in a (relatively) - small kernel buffer. This data is read by Ethereal and saved into + small kernel buffer. This data is read by Wireshark and saved into the capture file(s) the user specified. </para> diff --git a/docbook/eug_src/EUG_chapter_customize.xml b/docbook/eug_src/EUG_chapter_customize.xml index e8c4df2fb5..5c9c9d23e3 100644 --- a/docbook/eug_src/EUG_chapter_customize.xml +++ b/docbook/eug_src/EUG_chapter_customize.xml @@ -83,7 +83,7 @@ ethereal [ -vh ] [ -DklLnpQS ] [ -a <capture autostop condition> ] ... <varlistentry><term><command>-a <capture autostop condition></command></term> <listitem> <para> - Specify a criterion that specifies when Ethereal is to stop writing + Specify a criterion that specifies when Wireshark is to stop writing to a capture file. The criterion is of the form test:value, where test is one of: <variablelist> @@ -194,7 +194,7 @@ interface name is a somewhat complex string. Note that "can capture" means that Ethereal was able to open that device to do a live capture; if, on your system, a program doing a network capture must be run from an account with special privileges (for -example, as root), then, if Ethereal is run with the <command>-D</command> flag and +example, as root), then, if Wireshark is run with the <command>-D</command> flag and is not run from such an account, it will not list any interfaces. </para> </listitem> @@ -281,7 +281,7 @@ standard libpcap format. <listitem> <para> This option sets the name of the font used for most text - displayed by Ethereal. XXX - add an example! + displayed by Wireshark. XXX - add an example! </para> </listitem> </varlistentry> @@ -349,7 +349,7 @@ standard libpcap format. the interface might be in promiscuous mode for some other reason; hence, -p cannot be used to ensure that the only traffic that is captured is traffic sent to or from the - machine on which Ethereal is running, broadcast traffic, and + machine on which Wireshark is running, broadcast traffic, and multicast traffic to addresses received by that machine. </para> </listitem> @@ -367,7 +367,7 @@ standard libpcap format. <varlistentry><term><command>-r <infile></command></term> <listitem> <para> - This option provides the name of a capture file for Ethereal + This option provides the name of a capture file for Wireshark to read and display. This capture file can be in one of the formats Ethereal understands. </para> @@ -491,7 +491,7 @@ standard libpcap format. <section id="ChCustColorizationSection"><title>Packet colorization</title> <para> - A very useful mechanism available in Ethereal is packet colorization. + A very useful mechanism available in Wireshark is packet colorization. You can set-up Ethereal so that it will colorize packets according to a filter. This allows you to emphasize the packets you are usually interested in. @@ -569,7 +569,7 @@ standard libpcap format. </note> <para> <xref linkend="ChCustColorFilterMany"/> shows an example of several color - filters being used in Ethereal. You may not like the color choices, + filters being used in Wireshark. You may not like the color choices, however, feel free to choose your own. </para> <figure id="ChCustColorFilterMany"> @@ -629,7 +629,7 @@ standard libpcap format. <para> You have to use the Save button to save your settings. The OK or Apply buttons will not save your changes permanently, so they will be lost - when Ethereal is closed. + when Wireshark is closed. </para> </warning> <para> diff --git a/docbook/eug_src/EUG_chapter_introduction.xml b/docbook/eug_src/EUG_chapter_introduction.xml index 68e7807ed9..1c91edd811 100644 --- a/docbook/eug_src/EUG_chapter_introduction.xml +++ b/docbook/eug_src/EUG_chapter_introduction.xml @@ -7,7 +7,7 @@ <section id="ChIntroWhatIs"> <title>What is <application>Ethereal?</application></title> <para> - Ethereal is a network packet analyzer. A network packet + Wireshark is a network packet analyzer. A network packet analyzer will try to capture network packets and tries to display that packet data as detailed as possible. </para> @@ -141,14 +141,14 @@ <title>Many protocol decoders</title> <para> There are protocol decoders (or dissectors, as they are - known in Ethereal) for a great many protocols: + known in Wireshark) for a great many protocols: see <xref linkend="AppProtocols"/>. </para> </section> <section><title>Open Source Software</title> <para> - Ethereal is an open source software project, and is released under + Wireshark is an open source software project, and is released under the <ulink url="&GPLWebsite;">GNU General Public Licence</ulink> (GPL). You can freely use Ethereal on any number of computers you like, without worrying about license keys or fees or such. In addition, all source @@ -158,7 +158,7 @@ </para> </section> - <section id="ChIntroNoFeatures"><title>What Ethereal is not</title> + <section id="ChIntroNoFeatures"><title>What Wireshark is not</title> <para> Here are some things Ethereal does not provide: <itemizedlist> @@ -341,7 +341,7 @@ </title> <para> Ethereal was initially developed by Gerald Combs. Ongoing development - and maintenance of Ethereal is handled by the Ethereal team, a loose + and maintenance of Wireshark is handled by the Ethereal team, a loose group of individuals who fix bugs and provide new functionality. </para> <para> @@ -353,7 +353,7 @@ Ethereal web site. </para> <para> - Ethereal is an open source software project, and is released under + Wireshark is an open source software project, and is released under the <ulink url="&GPLWebsite;">GNU General Public Licence</ulink> (GPL). All source code is freely available under the GPL. You are welcome to modify Ethereal to suit your own needs, and it would be appreciated @@ -383,7 +383,7 @@ The maintainers and developers of Ethereal will maintain your code as well, fixing it when API changes or other changes are made, and generally keeping it in tune with what is happening - with Ethereal. So if Ethereal is updated (which is done often), + with Ethereal. So if Wireshark is updated (which is done often), you can get a new Ethereal version from the website and your changes will already be included without any effort for you. </para> @@ -391,7 +391,7 @@ </itemizedlist> </para> <para> - The Ethereal source code and binary kits for some platforms are all + The Wireshark source code and binary kits for some platforms are all available on the download page of the Ethereal website: <ulink url="&EtherealDownloadPage;">&EtherealDownloadPage;</ulink>. </para> @@ -414,7 +414,7 @@ <section id="ChIntroWiki"><title>Wiki</title> <para> - The Ethereal Wiki at <ulink + The Wireshark Wiki at <ulink url="&EtherealWikiPage;">&EtherealWikiPage;</ulink> provides a wide range of information related to Ethereal and packet capturing in general. You will find a lot of information not part of this user's guide. For @@ -475,7 +475,7 @@ <varlistentry><term><command>ethereal-dev</command></term> <listitem> <para> - This list is for Ethereal developers. If you want to start + This list is for Wireshark developers. If you want to start developing a protocol dissector, join this list. </para> </listitem> diff --git a/docbook/eug_src/EUG_chapter_troubleshoot.xml b/docbook/eug_src/EUG_chapter_troubleshoot.xml index b0afb9b251..ffeb050f4a 100644 --- a/docbook/eug_src/EUG_chapter_troubleshoot.xml +++ b/docbook/eug_src/EUG_chapter_troubleshoot.xml @@ -6,7 +6,7 @@ <section> <title>An approach to troubleshooting with Ethereal</title> <para> - Ethereal is a very useful tool for network troubleshooting, since it + Wireshark is a very useful tool for network troubleshooting, since it contains a number of features that allow you to quickly focus on problems in your networkfor several reasons: <itemizedlist> diff --git a/docbook/eug_src/EUG_chapter_use.xml b/docbook/eug_src/EUG_chapter_use.xml index 4daf701211..36838f46a5 100644 --- a/docbook/eug_src/EUG_chapter_use.xml +++ b/docbook/eug_src/EUG_chapter_use.xml @@ -132,7 +132,7 @@ <section id="ChUseMenuSection"><title>The Menu</title> <para> - The Ethereal menu sits on top of the Ethereal window. + The Wireshark menu sits on top of the Ethereal window. An example is shown in <xref linkend="ChUseEtherealMenu"/>. </para> <note><title>Note!</title> @@ -238,7 +238,7 @@ <section id="ChUseFileMenuSection"><title>The "File" menu</title> <para> - The Ethereal file menu contains the fields shown in + The Wireshark file menu contains the fields shown in <xref linkend="ChUseTabFile"/>. </para> <figure id="ChUseEtherealFileMenu"> @@ -465,7 +465,7 @@ <section id="ChUseEditMenuSection"><title>The "Edit" menu</title> <para> - The Ethereal Edit menu contains the fields shown in + The Wireshark Edit menu contains the fields shown in <xref linkend="ChUseTabEdit"/>. </para> <figure id="ChUseEtherealEditMenu"> @@ -583,7 +583,7 @@ <section id="ChUseViewMenuSection"><title>The "View" menu</title> <para> - The Ethereal View menu contains the fields shown in + The Wireshark View menu contains the fields shown in <xref linkend="ChUseTabView"/>. </para> <figure id="ChUseEtherealViewMenu"> @@ -912,7 +912,7 @@ <section id="ChUseGoMenuSection"><title>The "Go" menu</title> <para> - The Ethereal Go menu contains the fields shown in + The Wireshark Go menu contains the fields shown in <xref linkend="ChUseTabGo"/>. </para> <figure id="ChUseEtherealGoMenu"> @@ -992,7 +992,7 @@ <section id="ChUseCaptureMenuSection"><title>The "Capture" menu</title> <para> - The Ethereal Capture menu contains the fields shown in + The Wireshark Capture menu contains the fields shown in <xref linkend="ChUseTabCap"/>. </para> <figure id="ChUseEtherealCaptureMenu"> @@ -1073,7 +1073,7 @@ <section id="ChUseAnalyzeMenuSection"><title>The "Analyze" menu</title> <para> - The Ethereal Analyze menu contains the fields shown in + The Wireshark Analyze menu contains the fields shown in <xref linkend="ChUseAnalyze"/>. </para> <figure id="ChUseEtherealAnalyzeMenu"> @@ -1176,7 +1176,7 @@ <section id="ChUseStatisticsMenuSection"><title>The "Statistics" menu</title> <para> - The Ethereal Statistics menu contains the fields shown in + The Wireshark Statistics menu contains the fields shown in <xref linkend="ChUseStatistics"/>. </para> <figure id="ChUseEtherealStatisticsMenu"> @@ -1363,7 +1363,7 @@ <section id="ChUseHelpMenuSection"><title>The "Help" menu</title> <para> - The Ethereal Help menu contains the fields shown in + The Wireshark Help menu contains the fields shown in <xref linkend="ChUseHelp"/>. </para> <figure id="ChUseEtherealHelpMenu"> @@ -2016,7 +2016,7 @@ <graphic entityref="EtherealStatusbarEmpty" format="PNG"/> </figure> This statusbar is shown while no capture file is loaded, e.g. when - Ethereal is started. + Wireshark is started. </para> <para> <figure id="ChUseEtherealStatusbarLoaded"> diff --git a/docbook/eug_src/EUG_chapter_work.xml b/docbook/eug_src/EUG_chapter_work.xml index 1b9854abd4..76bde0dbdd 100644 --- a/docbook/eug_src/EUG_chapter_work.xml +++ b/docbook/eug_src/EUG_chapter_work.xml @@ -27,7 +27,7 @@ </figure> </para> <para> - You can also select and view packets the same way, while Ethereal is + You can also select and view packets the same way, while Wireshark is capturing, if you selected "Update list of packets in real time" in the Ethereal Capture Preferences dialog box. </para> @@ -753,7 +753,7 @@ ip.len le 0x436 <section> <title>Combining expressions</title> <para> - You can combine filter expressions in Ethereal using the + You can combine filter expressions in Wireshark using the logical operators shown in <xref linkend="FiltLogOps"/> </para> <table id="FiltLogOps"> diff --git a/docbook/eug_src/EUG_preface.xml b/docbook/eug_src/EUG_preface.xml index 222e7e86a7..2802bdf284 100644 --- a/docbook/eug_src/EUG_preface.xml +++ b/docbook/eug_src/EUG_preface.xml @@ -5,7 +5,7 @@ <section id="PreForeword"> <title>Foreword</title> <para> - Ethereal is one of those programs that many network managers would love + Wireshark is one of those programs that many network managers would love to be able to use, but they are often prevented from getting what they would like from Ethereal because of the lack of documentation. </para> diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml index ea223a7dd1..e244584141 100644 --- a/docbook/release-notes.xml +++ b/docbook/release-notes.xml @@ -21,7 +21,7 @@ Ethereal Info <section id="WhatIs"><title>What is Ethereal?</title> <para> - Ethereal is the world's most popular network protocol analyzer. It + Wireshark is the world's most popular network protocol analyzer. It is used for troubleshooting, analysis, development, and education. </para> </section> @@ -47,7 +47,7 @@ Ethereal Info Under a grant funded by the U.S. Department of Homeland Security, <ulink url="http://www.coverity.com">Coverity</ulink> has uncovered - a number of vulnerabilities in Ethereal: + a number of vulnerabilities in Wireshark: <itemizedlist> <!-- CID 1 - 149: Fixed for 0.99.0 --> diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml index 75993ee564..d870c5835f 100644 --- a/docbook/user-guide.xml +++ b/docbook/user-guide.xml @@ -54,7 +54,7 @@ DOCUMENT SECTION --> <!ENTITY DocumentTitle "<application>Ethereal</application> User's Guide"> - <!ENTITY DocumentSubTitle "&SvnVersion; for Ethereal &EtherealCurrentVersion;"> + <!ENTITY DocumentSubTitle "&SvnVersion; for Wireshark &EtherealCurrentVersion;"> <!ENTITY DocumentTitleAbbreviation "EUG"> <!ENTITY DocumentCopyrightHolder1 "Ulf Lamping "> @@ -1,2 +1,2 @@ epan 0.0.0: -* Initial public release (in ethereal CVS tree) +* Initial public release (in wireshark CVS tree) diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 390830aa8b..54945b6154 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -119,7 +119,7 @@ void get_addr_name_buf(address *addr, gchar *buf, guint size); /* host_name_lookup_init fires up an ADNS socket if we're using ADNS */ extern void host_name_lookup_init(void); -/* host_name_lookup_process does ADNS processing in GTK+ timeouts in Ethereal, +/* host_name_lookup_process does ADNS processing in GTK+ timeouts in Wireshark, and before processing each packet in Tethereal, if we're using ADNS */ extern gint host_name_lookup_process(gpointer data); diff --git a/epan/dfilter/README.dfilter b/epan/dfilter/README.dfilter index 4c2cb69cf9..bbec3c714d 100644 --- a/epan/dfilter/README.dfilter +++ b/epan/dfilter/README.dfilter @@ -92,13 +92,13 @@ Go to ethereal/epan/ftypes/ Edit ftypes.h and declare the fvalue_foo(), ftype_can_foo() and fvalue_foo() methods. Add the cmp_foo() method to the struct _ftype_t. -This is the first time that a make in ethereal/epan/dfilter/ can succeed. If it fails, then some code in the previously edited files must be corrected. +This is the first time that a make in wireshark/epan/dfilter/ can succeed. If it fails, then some code in the previously edited files must be corrected. Edit ftypes.c and define the fvalue_foo() method with its associated logic. Define also the ftype_can_foo() and fvalue_foo() methods. Edit all ftype-*.c files and add the required fvalue_foo() methods. -This is the point where you should be able to compile without errors in ethereal/epan/ftypes/. If not, first fix the errors. +This is the point where you should be able to compile without errors in wireshark/epan/ftypes/. If not, first fix the errors. Go to ethereal/epan/ and run make. If this one succeeds, then we're almost done as no errors should occur here. diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index 01864916d3..69c52fe1ff 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -1351,7 +1351,7 @@ process_ptvc_record(ptvcursor_t *ptvc, const ptvc_record *rec, * of NCP request and give a sequence ID. The response, unfortunately, only * identifies itself via the sequence ID; you have to know what type of NCP * request the request packet contained in order to successfully parse the NCP - * response. A global method for doing this does not exist in ethereal yet + * response. A global method for doing this does not exist in wireshark yet * (NFS also requires it), so for now the NCP section will keep its own hash * table keeping track of NCP packet types. * @@ -1453,7 +1453,7 @@ ncp_req_eid_hash_cleanup(gpointer key _U_, gpointer value, gpointer user_data _U } /* Initializes the hash table and the mem_chunk area each time a new - * file is loaded or re-loaded in ethereal */ + * file is loaded or re-loaded in wireshark */ static void ncp_init_protocol(void) { diff --git a/epan/dtd_parse.l b/epan/dtd_parse.l index 8ee18560d6..25e6513fad 100644 --- a/epan/dtd_parse.l +++ b/epan/dtd_parse.l @@ -199,7 +199,7 @@ squoted ['][^\']*['] <GET_ATTR_QUOTE>. { g_string_sprintfa(build_data->error, - "error in ethereal:protocol xmpli at %s : could not find attribute value!", + "error in wireshark:protocol xmpli at %s : could not find attribute value!", location); yyterminate(); } @@ -219,7 +219,7 @@ squoted ['][^\']*['] if (! got_it) { g_string_sprintfa(build_data->error, - "error in ethereal:protocol xmpli at %s : no such parameter %s!", + "error in wireshark:protocol xmpli at %s : no such parameter %s!", location, attr_name); g_free(attr_name); yyterminate(); diff --git a/epan/h225-persistentdata.h b/epan/h225-persistentdata.h index 9e60cec275..187492ea35 100644 --- a/epan/h225-persistentdata.h +++ b/epan/h225-persistentdata.h @@ -57,6 +57,6 @@ h225ras_call_t * find_h225ras_call(h225ras_call_info_key *h225ras_call_key ,int h225ras_call_t * new_h225ras_call(h225ras_call_info_key *h225ras_call_key, packet_info *pinfo, e_guid_t *guid, int category); h225ras_call_t * append_h225ras_call(h225ras_call_t *prev_call, packet_info *pinfo, e_guid_t *guid, int category); -void h225_init_routine(void); /* init routine, used by ethereal */ +void h225_init_routine(void); /* init routine, used by wireshark */ #endif /* __h225_HASH__*/ diff --git a/epan/plugins.c b/epan/plugins.c index 4d7b3a34ad..7d4abd5404 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -419,7 +419,7 @@ init_plugins(const char *plugin_dir) * If the program wasn't started with special privileges, * scan the users plugin directory. (Even if we relinquish * them, plugins aren't safe unless we've *permanently* - * relinquished them, and we can't do that in Ethereal as, + * relinquished them, and we can't do that in Wireshark as, * if we need privileges to start capturing, we'd need to * reclaim them before each time we start capturing.) */ diff --git a/epan/timestamp.h b/epan/timestamp.h index ac06c6b63c..03dbf70403 100644 --- a/epan/timestamp.h +++ b/epan/timestamp.h @@ -34,7 +34,7 @@ typedef enum { TS_ABSOLUTE_WITH_DATE, TS_DELTA, /* - * Special value used for the command-line setting in Ethereal, to indicate + * Special value used for the command-line setting in Wireshark, to indicate * that no value has been set from the command line. */ TS_NOT_SET diff --git a/ethereal_be.py b/ethereal_be.py index 6a30a40d60..8c8d72b592 100644 --- a/ethereal_be.py +++ b/ethereal_be.py @@ -13,8 +13,8 @@ # is "C". It will generate code to use the GIOP/IIOP get_CDR_XXX API. # # -# Please see packet-giop.h in Ethereal distro for API description. -# Ethereal is available at http://www.ethereal.com/ +# Please see packet-giop.h in Wireshark distro for API description. +# Wireshark is available at http://www.ethereal.com/ # # Omniidl is part of the OmniOrb distribution, and is available at # http://www.uk.research.att.com/omniORB/omniORB.html diff --git a/ethereal_gen.py b/ethereal_gen.py index 257979246e..751ffaac98 100644 --- a/ethereal_gen.py +++ b/ethereal_gen.py @@ -12,8 +12,8 @@ # dissectors from CORBA IDL descriptions. The output language generated # is "C". It will generate code to use the GIOP/IIOP get_CDR_XXX API. # -# Please see packet-giop.h in Ethereal distro for API description. -# Ethereal is available at http://www.ethereal.com/ +# Please see packet-giop.h in Wireshark distro for API description. +# Wireshark is available at http://www.ethereal.com/ # # Omniidl is part of the OmniOrb distribution, and is available at # http://www.uk.research.att.com/omniORB/omniORB.html diff --git a/help/Makefile.am b/help/Makefile.am index feec7c860e..a7b5181003 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am -# Automake file for Ethereal help files +# Automake file for Wireshark help files # # $Id$ # diff --git a/help/faq.txt b/help/faq.txt index 2555f0d9f2..459f761e12 100644 --- a/help/faq.txt +++ b/help/faq.txt @@ -1,5 +1,5 @@ - The Ethereal FAQ + The Wireshark FAQ Note: This is just an ASCII snapshot of the faq and may not be up to date. Please go to http://www.ethereal.com/faq.html for the up @@ -247,11 +247,11 @@ Q 1.2: How much does Ethereal cost? - A: Ethereal is "free software"; you can download it without paying any + A: Wireshark is "free software"; you can download it without paying any license fee. The version of Ethereal you download isn't a "demo" version, with limitations not present in a "full" version; it is the full version. - The license under which Ethereal is issued is the GNU General Public + The license under which Wireshark is issued is the GNU General Public License. See the GNU GPL FAQ for some more information. Q 1.3: Can I use Ethereal commercially? @@ -265,7 +265,7 @@ Q 1.4: Can I use Ethereal as part of my commercial product? - A: As noted, Ethereal is licensed under the GNU General Public License. The + A: As noted, Wireshark is licensed under the GNU General Public License. The GPL imposes conditions on your use of GPL'ed code in your own products; you cannot, for example, make a "derived work" from Ethereal, by making modifications to it, and then sell the resulting derived work and not allow @@ -1172,15 +1172,15 @@ cies Q 3.1: I installed an Ethereal RPM; why did it install Tethereal but not Ethereal? - A: Older versions of the Red Hat RPMs for Ethereal put only the non-GUI - components into the ethereal RPM, the fact that Ethereal is a GUI program + A: Older versions of the Red Hat RPMs for Wireshark put only the non-GUI + components into the ethereal RPM, the fact that Wireshark is a GUI program nonwithstanding; newer versions make it a bit clearer by giving that RPM a - name starting with ethereal-base. + name starting with wireshark-base. In those older versions, there's a separate ethereal-gnome RPM that includes GUI components such as Ethereal itself, the fact that Ethereal doesn't use GNOME nonwithstanding; newer versions make it a bit clearer by giving that - RPM a name starting with ethereal-gtk+. + RPM a name starting with wireshark-gtk+. Find the ethereal-gnome or ethereal-gtk+ RPM, and install that also. @@ -1275,7 +1275,7 @@ cies "** ERROR **: file print.c: line 691 (print_line): should not be reached. - A: This is a bug in Ethereal 0.10.0a, which is fixed in 0.10.1 and later + A: This is a bug in Wireshark 0.10.0a, which is fixed in 0.10.1 and later releases. To work around the bug, don't use "-x" unless you're also using "-V"; note that "-V" produces a full dissection of each packet, so you might not want to use it. @@ -1293,7 +1293,7 @@ cies A: Ethereal can only be linked with version 4.2.2 or later of UCD SNMP. Your version of Ethereal was dynamically linked with such a version of UCD SNMP; however, you have an older version of UCD SNMP installed, which means that - when Ethereal is run, it tries to link to the older version, and fails. You + when Wireshark is run, it tries to link to the older version, and fails. You will have to replace that version of UCD SNMP with version 4.2.2 or a later version. @@ -1322,7 +1322,7 @@ cies when I try to run Ethereal on Windows? - A: Ethereal is built using the GTK+ toolkit, which supports most + A: Wireshark is built using the GTK+ toolkit, which supports most UNIX-flavored OSes, and also supports Windows. Windows versions of Ethereal before 0.9.14 were built with an older version @@ -1354,7 +1354,7 @@ cies Gtk-CRITICAL **: file gtkwindow.c: line 3107 (gtk_window_resize): assertion `height > 0' failed. - A: This is a bug in Ethereal 0.10.5 and 0.10.5a, which is fixed in Ethereal + A: This is a bug in Wireshark 0.10.5 and 0.10.5a, which is fixed in Wireshark 0.10.6 and later releases. Q 6.2: I have an XXX network card on my machine; if I try to capture on it, @@ -1561,8 +1561,8 @@ cies A: Capture filters currently use a different syntax than display filters. Here's the corresponding section from the ethereal(1) man page: - "Display filters in Ethereal are very powerful; more fields are filterable - in Ethereal than in other protocol analyzers, and the syntax you can use to + "Display filters in Wireshark are very powerful; more fields are filterable + in Wireshark than in other protocol analyzers, and the syntax you can use to create your filters is richer. As Ethereal progresses, expect more and more protocol fields to be allowed in display filters. @@ -1593,7 +1593,7 @@ cies this bug. If you are running Ethereal on a UNIX-flavored platform, run "ethereal -v", - or select "About Ethereal..." from the "Help" menu in Ethereal, to see what + or select "About Ethereal..." from the "Help" menu in Wireshark, to see what version of libpcap it's using. If it's not 0.6 or later, you will need either to upgrade your OS to get a later version of libpcap, or will need to build and install a later version of libpcap from the tcpdump.org Web site @@ -1685,7 +1685,7 @@ cies Q 7.12: Why does Ethereal hang after I stop a capture? - A: The most likely reason for this is that Ethereal is trying to look up an + A: The most likely reason for this is that Wireshark is trying to look up an IP address in the capture to convert it to a name (so that, for example, it can display the name in the source address or destination address columns), and that lookup process is taking a very long time. @@ -1941,7 +1941,7 @@ cies A: Unfortunately, Windows 95/98/Me gives the same name to multiple instances of the type of same network adapter. Therefore, WinPcap cannot distinguish between them, so a WinPcap-based application can capture only on the first - such interface; Ethereal is a libpcap/WinPcap-based application. + such interface; Wireshark is a libpcap/WinPcap-based application. Q 8.6: I'm running Ethereal on Windows; why am I not seeing any traffic being sent by the machine running Ethereal? @@ -2156,7 +2156,7 @@ cies Q 11.1: Why am I seeing lots of packets with incorrect TCP checksums? A: If the packets that have incorrect TCP checksums are all being sent by - the machine on which Ethereal is running, this is probably because the + the machine on which Wireshark is running, this is probably because the network interface on which you're capturing does TCP checksum offloading. That means that the TCP checksum is added to the packet by the network interface, not by the OS's TCP/IP stack; when capturing on an interface, @@ -2212,7 +2212,7 @@ cies subsequent RTP traffic will be identified. Currently, that's the only place we do that; there may be other places. - However, there will always be places where Ethereal is simply incapable of + However, there will always be places where Wireshark is simply incapable of deducing that a given UDP flow is RTP; a mechanism would be needed to allow the user to specify that a given conversation should be treated as RTP. As of Ethereal 0.8.16, such a mechanism exists; if you select a UDP or TCP diff --git a/help/overview.txt b/help/overview.txt index 2e5d3317ca..b76fb46cbc 100644 --- a/help/overview.txt +++ b/help/overview.txt @@ -1,4 +1,4 @@ -Ethereal is a GUI network protocol analyzer. +Wireshark is a GUI network protocol analyzer. It lets you interactively browse packet data from a live network or from a previously saved capture file. @@ -33,4 +33,4 @@ Ethereal's native capture file format is libpcap format, which is also the forma -Endace Measurement Systems' ERF format captures -Linux Bluez Bluetooth stack hcidump -w traces -There is no need to tell Ethereal what type of file you are reading; it will determine the file type by itself. Ethereal is also capable of reading any of these file formats if they are compressed using gzip. Ethereal recognizes this directly from the file; the '.gz' extension is not required for this purpose. +There is no need to tell Ethereal what type of file you are reading; it will determine the file type by itself. Wireshark is also capable of reading any of these file formats if they are compressed using gzip. Ethereal recognizes this directly from the file; the '.gz' extension is not required for this purpose. diff --git a/idl2eth.sh b/idl2eth.sh index 8d9cbfc791..2ba26562da 100644 --- a/idl2eth.sh +++ b/idl2eth.sh @@ -17,8 +17,8 @@ # The output language generated is "C". It will generate code to use the # GIOP/IIOP get_CDR_XXX API. # -# Please see packet-giop.h in Ethereal distro for API description. -# Ethereal is available at http://www.ethereal.com/ +# Please see packet-giop.h in Wireshark distro for API description. +# Wireshark is available at http://www.ethereal.com/ # # Omniidl is part of the OmniOrb distribution, and is available at # http://omniorb.sourceforge.net/ @@ -49,7 +49,7 @@ if [ $# -lt 1 ]; then fi # -# Run ethereal backend, looking for ethereal_be.py and ethereal_gen.py +# Run wireshark backend, looking for ethereal_be.py and ethereal_gen.py # in pythons's "site-packages" directory. If cannot find that, then # try looking in current directory. If still cannot, then exit with # error. diff --git a/image/Makefile.nmake b/image/Makefile.nmake index 60b8d97f19..4bc6be93a3 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -13,7 +13,7 @@ ethereal.exe.manifest: ethereal.exe.manifest.in ..\config.nmake -e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \ < ethereal.exe.manifest.in > $@ -ethereal.rc : win32-file-dlg.rc ethereal.rc.in ethereal.exe.manifest ..\config.nmake +ethereal.rc : win32-file-dlg.rc ethereal.rc.in wireshark.exe.manifest ..\config.nmake sed -e s/@VERSION@/$(VERSION)/ \ -e s/@RC_VERSION@/$(RC_VERSION)/ \ < ethereal.rc.in > $@ diff --git a/image/capinfos.rc.in b/image/capinfos.rc.in index 7c41729fe8..cb0c36b2e8 100644 --- a/image/capinfos.rc.in +++ b/image/capinfos.rc.in @@ -19,7 +19,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Ethereal developer community\0" + VALUE "CompanyName", "The Wireshark developer community\0" VALUE "FileDescription", "Capinfos\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "Capinfos @VERSION@\0" diff --git a/image/dumpcap.rc.in b/image/dumpcap.rc.in index 4094b1ef34..69ca43fac1 100644 --- a/image/dumpcap.rc.in +++ b/image/dumpcap.rc.in @@ -19,7 +19,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Ethereal developer community\0" + VALUE "CompanyName", "The Wireshark developer community\0" VALUE "FileDescription", "Dumpcap\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "Dumpcap @VERSION@\0" diff --git a/image/editcap.rc.in b/image/editcap.rc.in index f16df4c268..02f84690a0 100644 --- a/image/editcap.rc.in +++ b/image/editcap.rc.in @@ -19,7 +19,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Ethereal developer community\0" + VALUE "CompanyName", "The Wireshark developer community\0" VALUE "FileDescription", "Editcap\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "Editcap @VERSION@\0" diff --git a/image/ethereal.rc.in b/image/ethereal.rc.in index b144652c5a..f2f2418dcd 100644 --- a/image/ethereal.rc.in +++ b/image/ethereal.rc.in @@ -21,7 +21,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Ethereal developer community, http://www.ethereal.com/\0" + VALUE "CompanyName", "The Wireshark developer community, http://www.ethereal.com/\0" VALUE "FileDescription", "Ethereal\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "Ethereal @VERSION@\0" diff --git a/image/libethereal.rc.in b/image/libethereal.rc.in index 381d331bef..89b35d1f4d 100644 --- a/image/libethereal.rc.in +++ b/image/libethereal.rc.in @@ -17,7 +17,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Ethereal developer community, http://www.ethereal.com/\0" + VALUE "CompanyName", "The Wireshark developer community, http://www.ethereal.com/\0" VALUE "FileDescription", "Ethereal dissector library\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "libethereal @VERSION@\0" diff --git a/image/mergecap.rc.in b/image/mergecap.rc.in index 1f0d887f99..8a2b1d6441 100644 --- a/image/mergecap.rc.in +++ b/image/mergecap.rc.in @@ -19,7 +19,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Ethereal developer community\0" + VALUE "CompanyName", "The Wireshark developer community\0" VALUE "FileDescription", "Mergecap\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "Mergecap @VERSION@\0" diff --git a/image/tethereal.rc.in b/image/tethereal.rc.in index 4f02f0f105..a71b59c5ba 100644 --- a/image/tethereal.rc.in +++ b/image/tethereal.rc.in @@ -19,7 +19,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Ethereal developer community\0" + VALUE "CompanyName", "The Wireshark developer community\0" VALUE "FileDescription", "Tethereal\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "Tethereal @VERSION@\0" diff --git a/image/text2pcap.rc.in b/image/text2pcap.rc.in index 616bab6b77..0362f7625b 100644 --- a/image/text2pcap.rc.in +++ b/image/text2pcap.rc.in @@ -19,7 +19,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Ethereal developer community\0" + VALUE "CompanyName", "The Wireshark developer community\0" VALUE "FileDescription", "Text2pcap\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "Text2pcap @VERSION@\0" diff --git a/image/wiretap.rc.in b/image/wiretap.rc.in index dddfc3b1cc..7d1dfe6023 100644 --- a/image/wiretap.rc.in +++ b/image/wiretap.rc.in @@ -17,7 +17,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "The Ethereal developer community, http://www.ethereal.com/\0" + VALUE "CompanyName", "The Wireshark developer community, http://www.ethereal.com/\0" VALUE "FileDescription", "Ethereal capture file library\0" VALUE "FileVersion", "@VERSION@\0" VALUE "InternalName", "wiretap @VERSION@\0" @@ -8,7 +8,7 @@ rm -f FAQ cat >FAQ <<EOF - The Ethereal FAQ + The Wireshark FAQ Note: This is just an ASCII snapshot of the faq and may not be up to date. Please go to http://www.ethereal.com/faq.html for the up @@ -36,7 +36,7 @@ # <http://www.cavebear.com/CaveBear/Ethernet/> # <ftp://ftp.cavebear.com/pub/Ethernet.txt> # -# The Ethereal 'manuf' file, which started out as a subset of Michael +# The Wireshark 'manuf' file, which started out as a subset of Michael # Patton's list and grew from there. # # In the event of data set collisions the Ethereal entries have been given diff --git a/manuf.tmpl b/manuf.tmpl index f939e085dc..10f6a7481b 100644 --- a/manuf.tmpl +++ b/manuf.tmpl @@ -33,7 +33,7 @@ # <http://www.cavebear.com/CaveBear/Ethernet/> # <ftp://ftp.cavebear.com/pub/Ethernet.txt> # -# The Ethereal 'manuf' file, which started out as a subset of Michael +# The Wireshark 'manuf' file, which started out as a subset of Michael # Patton's list and grew from there. # # In the event of data set collisions the Ethereal entries have been given diff --git a/packaging/nsis/WinPcapPage.ini b/packaging/nsis/WinPcapPage.ini index 59c28526ad..226b4b2cb7 100644 --- a/packaging/nsis/WinPcapPage.ini +++ b/packaging/nsis/WinPcapPage.ini @@ -31,7 +31,7 @@ Left=10 Right=250 Top=40 Bottom=48 -Text=This text will be replaced, depending on current WinPcap version in ethereal.nsi +Text=This text will be replaced, depending on current WinPcap version in wireshark.nsi State=1 [Field 5] diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index 2e753fb71b..4fe22a4eea 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -46,7 +46,7 @@ UninstallIcon "..\..\image\ethereal.ico" ; Uninstall stuff (NSIS 2.08: "\r\n" don't work here) !define MUI_UNCONFIRMPAGE_TEXT_TOP "The following Ethereal installation will be uninstalled. Click 'Next' to continue." ; Uninstall stuff (this text isn't used with the MODERN_UI!) -;UninstallText "This will uninstall Ethereal.\r\nBefore starting the uninstallation, make sure Ethereal is not running.\r\nClick 'Next' to continue." +;UninstallText "This will uninstall Ethereal.\r\nBefore starting the uninstallation, make sure Wireshark is not running.\r\nClick 'Next' to continue." XPStyle on @@ -71,7 +71,7 @@ XPStyle on !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_UNFINISHPAGE_NOAUTOCLOSE -!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Ethereal.\r\n\r\nBefore starting the installation, make sure Ethereal is not running.\r\n\r\nClick 'Next' to continue." +!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Ethereal.\r\n\r\nBefore starting the installation, make sure Wireshark is not running.\r\n\r\nClick 'Next' to continue." ;!define MUI_FINISHPAGE_LINK "Install WinPcap to be able to capture packets from a network!" ;!define MUI_FINISHPAGE_LINK_LOCATION "http://www.winpcap.org" @@ -173,7 +173,7 @@ Page custom DisplayWinPcapPage ; ============================================================================ ; License page configuration ; ============================================================================ -LicenseText "Ethereal is distributed under the GNU General Public License." +LicenseText "Wireshark is distributed under the GNU General Public License." LicenseData "..\..\COPYING" ; ============================================================================ @@ -456,7 +456,7 @@ File "..\..\help\faq.txt" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "DisplayVersion" "${VERSION}" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "DisplayName" "Ethereal ${VERSION}" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "UninstallString" '"$INSTDIR\uninstall.exe"' -WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "Publisher" "The Ethereal developer community, http://www.ethereal.com" +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "Publisher" "The Wireshark developer community, http://www.ethereal.com" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "HelpLink" "mailto:ethereal-users@ethereal.com" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "URLInfoAbout" "http://www.ethereal.com" WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "URLUpdateInfo" "http://www.ethereal.com/distribution/win32/" @@ -477,7 +477,7 @@ CreateDirectory "$SMPROGRAMS\Ethereal" ; "Do not include Readme, Help, or Uninstall entries on the Programs menu." Delete "$SMPROGRAMS\Ethereal\Ethereal Web Site.lnk" ;WriteINIStr "$SMPROGRAMS\Ethereal\Ethereal Web Site.url" "InternetShortcut" "URL" "http://www.ethereal.com/" -CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal.lnk" "$INSTDIR\ethereal.exe" "" "$INSTDIR\ethereal.exe" 0 "" "" "The Ethereal Network Protocol Analyzer" +CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal.lnk" "$INSTDIR\ethereal.exe" "" "$INSTDIR\ethereal.exe" 0 "" "" "The Wireshark Network Protocol Analyzer" ;CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Manual.lnk" "$INSTDIR\ethereal.html" ;CreateShortCut "$SMPROGRAMS\Ethereal\Display Filters Manual.lnk" "$INSTDIR\ethereal-filter.html" CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Program Directory.lnk" \ @@ -495,7 +495,7 @@ StrCmp $R1 "yes" SecRequired_install_DesktopIcon ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State" StrCmp $0 "0" SecRequired_skip_DesktopIcon SecRequired_install_DesktopIcon: -CreateShortCut "$DESKTOP\Ethereal.lnk" "$INSTDIR\ethereal.exe" "" "$INSTDIR\ethereal.exe" 0 "" "" "The Ethereal Network Protocol Analyzer" +CreateShortCut "$DESKTOP\Ethereal.lnk" "$INSTDIR\ethereal.exe" "" "$INSTDIR\ethereal.exe" 0 "" "" "The Wireshark Network Protocol Analyzer" SecRequired_skip_DesktopIcon: ; is command line option "/quicklaunchicon" set? @@ -508,7 +508,7 @@ StrCmp $R1 "yes" SecRequired_install_QuickLaunchIcon ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State" StrCmp $0 "0" SecRequired_skip_QuickLaunchIcon SecRequired_install_QuickLaunchIcon: -CreateShortCut "$QUICKLAUNCH\Ethereal.lnk" "$INSTDIR\ethereal.exe" "" "$INSTDIR\ethereal.exe" 0 "" "" "The Ethereal Network Protocol Analyzer" +CreateShortCut "$QUICKLAUNCH\Ethereal.lnk" "$INSTDIR\ethereal.exe" "" "$INSTDIR\ethereal.exe" 0 "" "" "The Wireshark Network Protocol Analyzer" SecRequired_skip_QuickLaunchIcon: ; Create File Extensions (depending on additional tasks page) @@ -1194,9 +1194,9 @@ lbl_npf_done: ; if Ethereal was previously installed, unselect previously not installed icons etc. - ; detect if Ethereal is already installed -> + ; detect if Wireshark is already installed -> ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Ethereal" "UninstallString" - IfErrors lbl_ethereal_notinstalled ;if RegKey is unavailable, Ethereal is not installed + IfErrors lbl_ethereal_notinstalled ;if RegKey is unavailable, Wireshark is not installed ; only select Start Menu Group, if previously installed ; (we use the "all users" start menu, so select it first) diff --git a/packaging/rpm/SPECS/ethereal.spec.in b/packaging/rpm/SPECS/ethereal.spec.in index 25fca21d3b..3e4c0fb164 100644 --- a/packaging/rpm/SPECS/ethereal.spec.in +++ b/packaging/rpm/SPECS/ethereal.spec.in @@ -19,7 +19,7 @@ Requires: gtk2 Requires: libpcap openssl %description -Ethereal is a free network protocol analyzer for Unix and Windows. It +Wireshark is a free network protocol analyzer for Unix and Windows. It allows you to examine data from a live network or from a capture file on disk. You can interactively browse the capture data, viewing summary and detail information for each packet. Ethereal has several powerful diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 1db25ae747..49e95b4e14 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am -# Automake file for Ethereal +# Automake file for Wireshark # # $Id$ # diff --git a/plugins/docsis/ChangeLog b/plugins/docsis/ChangeLog index 062b94b72d..9251dbc0e2 100644 --- a/plugins/docsis/ChangeLog +++ b/plugins/docsis/ChangeLog @@ -1,15 +1,15 @@ -Overview of changes in Ethereal DOCSIS Plugin 0.0.2 +Overview of changes in Wireshark DOCSIS Plugin 0.0.2 * Fixed a number of cosmetic things. -Overview of changes in Ethereal DOCSIS Plugin 0.0.3 +Overview of changes in Wireshark DOCSIS Plugin 0.0.3 * Added Checks to each TLV Type to validate length. If the length is invalid an Exception is thrown. * Cleaned up the code in all dissctors so that they are a little more readable. -Overview of changes in Ethereal DOCSIS Plugin 0.0.4 +Overview of changes in Wireshark DOCSIS Plugin 0.0.4 * Added Support for Baseline Privacy Key Management Messages * Added Concatenation Support -Overview of changes in Ethereal DOCSIS Plugin 0.0.5 +Overview of changes in Wireshark DOCSIS Plugin 0.0.5 * Added Support in packet-tlv.c for SNMPv3 Kickstart TLV's * Added Support in packet-tlv.c for Subscriber Management TLV's diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am index 3ce21a01d2..48ec6d7e85 100644 --- a/plugins/giop/Makefile.am +++ b/plugins/giop/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am -# Automake file for Ethereal/GIOP subdissectors +# Automake file for Wireshark/GIOP subdissectors # # $Id$ # diff --git a/plugins/gryphon/README b/plugins/gryphon/README index 77ef1da2b1..a8e963f9a9 100644 --- a/plugins/gryphon/README +++ b/plugins/gryphon/README @@ -1,5 +1,5 @@ Dearborn Group Technology has released under GPL this plugin -for Ethereal. It decodes the protocol used by their Gryphon +for Wireshark. It decodes the protocol used by their Gryphon automotive network tool. The plugin decodes the communication protocol, but not any diff --git a/plugins/lua/README b/plugins/lua/README index ca86f646f7..473c034175 100644 --- a/plugins/lua/README +++ b/plugins/lua/README @@ -29,9 +29,9 @@ SubTreeType -- a class to represent an ett SubTreeTypeArr -- a class that represents the ett array for a protocol .new(subtree*,...) -- creates an array :add(subtree*,...) -- adds Etts to the array - :register() -- registers the ett array with ethereal + :register() -- registers the ett array with wireshark -Proto -- a class that represents protocol info in ethereal +Proto -- a class that represents protocol info in wireshark .new(name,filter_name,descr) -- creates and registers a new protocol :register_field_array(field_array) -- registers a field array as this protocol's :add_uint_pref(abbr,...) -- adds an uint preference to this protocol diff --git a/plugins/lua/elua_proto.c b/plugins/lua/elua_proto.c index 5a3c4bd6f8..d6d3a8decf 100644 --- a/plugins/lua/elua_proto.c +++ b/plugins/lua/elua_proto.c @@ -641,7 +641,7 @@ int ProtoField_register(lua_State* L) { ELUA_CLASS_DEFINE(Proto,NOP) /* - A new protocol in ethereal. Protocols have more uses, the main one is to dissect + A new protocol in wireshark. Protocols have more uses, the main one is to dissect a protocol. But they can be just dummies used to register preferences for other purposes. */ diff --git a/plugins/mgcp/ChangeLog b/plugins/mgcp/ChangeLog index b918848652..56ef41f94e 100644 --- a/plugins/mgcp/ChangeLog +++ b/plugins/mgcp/ChangeLog @@ -1,8 +1,8 @@ -Overview of changes in Ethereal MGCP plugin 0.0.9: +Overview of changes in Wireshark MGCP plugin 0.0.9: * Added calculation of request-to-response time delay * support for building detailed delay statistics by the tapping subsystem of ethereal -Overview of changes in Ethereal MGCP plugin 0.0.2: +Overview of changes in Wireshark MGCP plugin 0.0.2: * Fixed misc problems with improperly dissecting some xgcp packets as short or malformed. @@ -392,7 +392,7 @@ proto_tree_write_node_pdml(proto_node *node, gpointer data) } /* Print info for a 'geninfo' pseudo-protocol. This is required by - * the PDML spec. The information is contained in Ethereal's 'frame' protocol, + * the PDML spec. The information is contained in Wireshark's 'frame' protocol, * but we produce a 'geninfo' protocol in the PDML to conform to spec. * The 'frame' protocol follows the 'geninfo' protocol in the PDML. */ static void @@ -694,7 +694,7 @@ print_hex_data(print_stream_t *stream, epan_dissect_t *edt) * This routine is based on a routine created by Dan Lasley * <DLASLEY@PROMUS.com>. * - * It was modified for Ethereal by Gilbert Ramirez and others. + * It was modified for Wireshark by Gilbert Ramirez and others. */ #define MAX_OFFSET_LEN 8 /* max length of hex offset of bytes */ diff --git a/sync_pipe.h b/sync_pipe.h index d6674fb0f6..bc063839ae 100644 --- a/sync_pipe.h +++ b/sync_pipe.h @@ -1,5 +1,5 @@ /* sync_pipe.h - * Low-level synchronization pipe routines for use by Ethereal and dumpcap + * Low-level synchronization pipe routines for use by Wireshark and dumpcap * * $Id$ * diff --git a/tap-dcerpcstat.c b/tap-dcerpcstat.c index 8e56b049e8..e5f990ee9c 100644 --- a/tap-dcerpcstat.c +++ b/tap-dcerpcstat.c @@ -208,7 +208,7 @@ dcerpcstat_init(const char *optarg, void* userdata _U_) * if it's omitted? * * XXX - should this be called "srt" rather than "rtt"? The - * equivalent tap for Ethereal calls it "srt", for "Service + * equivalent tap for Wireshark calls it "srt", for "Service * Response Time", rather than "rtt" for "Round-Trip Time". */ if(sscanf(optarg,"dcerpc,rtt,%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x,%d.%d%n", &d1,&d2,&d3,&d40,&d41,&d42,&d43,&d44,&d45,&d46,&d47,&major,&minor,&pos)==13){ diff --git a/tap-rpcstat.c b/tap-rpcstat.c index 6e8973ad58..5f0ccbbb6a 100644 --- a/tap-rpcstat.c +++ b/tap-rpcstat.c @@ -69,7 +69,7 @@ typedef struct _rpcstat_t { /* This callback is never used by tethereal but it is here for completeness. * When registering below, we could just have left this function as NULL. * - * When used by ethereal, this function will be called whenever we would need + * When used by wireshark, this function will be called whenever we would need * to reset all state. Such as when ethereal opens a new file, when it * starts a new capture, when it rescans the packetlist after some prefs have * changed etc. @@ -191,7 +191,7 @@ rpcstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt _U_, const voi * stdout. * Tethereal will only call this callback once, which is when tethereal has * finished reading all packets and exists. - * If used with ethereal this may be called any time, perhaps once every 3 + * If used with wireshark this may be called any time, perhaps once every 3 * seconds or so. * This function may even be called in parallell with (*reset) or (*draw) * so make sure there are no races. The data in the rpcstat_t can thus change diff --git a/tap-smbsids.c b/tap-smbsids.c index 8453a71db1..a9192344ac 100644 --- a/tap-smbsids.c +++ b/tap-smbsids.c @@ -75,7 +75,7 @@ smbsids_init(const char *optarg _U_, void* userdata _U_) if(!sid_name_snooping){ fprintf(stderr,"The -z smb,sids function needs SMB/SID-Snooping to be enabled.\n"); - fprintf(stderr,"Either enable Edit/Preferences/Protocols/SMB/Snoop SID name mappings in ethereal\n"); + fprintf(stderr,"Either enable Edit/Preferences/Protocols/SMB/Snoop SID name mappings in wireshark\n"); fprintf(stderr,"or override the preference file by specifying\n"); fprintf(stderr," -o \"smb.sid_name_snooping=TRUE\"\n"); fprintf(stderr,"on the tethereal command line.\n"); diff --git a/tap-wspstat.c b/tap-wspstat.c index 3c4b064f80..f6e2efe871 100644 --- a/tap-wspstat.c +++ b/tap-wspstat.c @@ -173,7 +173,7 @@ wspstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const * stdout. * Tethereal will only call this callback once, which is when tethereal has * finished reading all packets and exists. - * If used with ethereal this may be called any time, perhaps once every 3 + * If used with wireshark this may be called any time, perhaps once every 3 * seconds or so. * This function may even be called in parallell with (*reset) or (*draw) * so make sure there are no races. The data in the rpcstat_t can thus change diff --git a/tethereal.c b/tethereal.c index 06f8c09cb6..14ec0b3374 100644 --- a/tethereal.c +++ b/tethereal.c @@ -260,7 +260,7 @@ print_usage(gboolean print_ver) fprintf(output, "\n"); fprintf(output, "Processing:\n"); - fprintf(output, " -R <read filter> packet filter in Ethereal display filter syntax\n"); + fprintf(output, " -R <read filter> packet filter in Wireshark display filter syntax\n"); fprintf(output, " -n disable all name resolutions (def: all enabled)\n"); fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mntC\"\n"); fprintf(output, " -d %s ...\n", decode_as_arg_template); @@ -2469,7 +2469,7 @@ print_columns(capture_file *cf) * * (XXX - it might be nice to be able to save and print at * the same time, sort of like an "Update list of packets - * in real time" capture in Ethereal.) + * in real time" capture in Wireshark.) */ if (capture_opts.iface != NULL) continue; diff --git a/tools/Makefile.am b/tools/Makefile.am index db222971a8..abf2b8cdd2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am -# Automake file for Ethereal +# Automake file for Wireshark # # $Id$ # diff --git a/tools/dfilter-test.py b/tools/dfilter-test.py index f77319e3f2..8af7907869 100755 --- a/tools/dfilter-test.py +++ b/tools/dfilter-test.py @@ -950,7 +950,7 @@ class String(Test): return self.DFilterCount(pkt_http, 'http.request.method <= "HEAE"', 1) - # XXX - this isn't handled in ethereal yet + # XXX - this isn't handled in wireshark yet def ck_slice_1(self): return self.DFilterCount(pkt_http, 'http.request.method[0] == "H"', 1) @@ -1220,7 +1220,7 @@ class TVB(Test): return self.DFilterCount(pkt_http, "ip[2:2] == 00:c1", 1) - # These don't work yet in Ethereal + # These don't work yet in Wireshark def ck_slice_4(self): return self.DFilterCount(pkt_http, "ip[-5] == 0x86", 1) diff --git a/tools/ftsanity.py b/tools/ftsanity.py index 4d872d82a7..855f68db7b 100755 --- a/tools/ftsanity.py +++ b/tools/ftsanity.py @@ -1,6 +1,6 @@ #!/usr/bin/env python """ -Check the sanity of field definitions in Ethereal. +Check the sanity of field definitions in Wireshark. """ import sys diff --git a/tools/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm b/tools/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm index e3296c1629..df9ac064b1 100644 --- a/tools/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm +++ b/tools/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm @@ -7,7 +7,7 @@ =head1 NAME -Parse::Pidl::Ethereal::Conformance - Conformance file parser for Ethereal +Parse::Pidl::Ethereal::Conformance - Conformance file parser for Wireshark =head1 DESCRIPTION diff --git a/tools/pidl/lib/Parse/Pidl/Ethereal/NDR.pm b/tools/pidl/lib/Parse/Pidl/Ethereal/NDR.pm index 371c35b374..8d5149348c 100644 --- a/tools/pidl/lib/Parse/Pidl/Ethereal/NDR.pm +++ b/tools/pidl/lib/Parse/Pidl/Ethereal/NDR.pm @@ -10,7 +10,7 @@ =head1 NAME -Parse::Pidl::Ethereal::NDR - Parser generator for Ethereal +Parse::Pidl::Ethereal::NDR - Parser generator for Wireshark =cut diff --git a/version_info.c b/version_info.c index 6b508b9e79..b25e3905df 100644 --- a/version_info.c +++ b/version_info.c @@ -1,5 +1,5 @@ /* version_info.c - * Routines to report version information for stuff used by Ethereal + * Routines to report version information for stuff used by Wireshark * * $Id$ * @@ -213,7 +213,7 @@ get_compiled_version_info(GString *str) #ifndef HAVE_LIBPCRE break_point = str->len - 1; g_string_append(str, - "\nNOTE: this build doesn't support the \"matches\" operator for Ethereal filter" + "\nNOTE: this build doesn't support the \"matches\" operator for Wireshark filter" "\nsyntax."); do_word_wrap(str, break_point); #endif /* HAVE_LIBPCRE */ diff --git a/version_info.h b/version_info.h index 767164487a..b7e15483c4 100644 --- a/version_info.h +++ b/version_info.h @@ -1,6 +1,6 @@ /* version_info.h * Declarations of outines to report version information for stuff used - * by Ethereal + * by Wireshark * * $Id$ * diff --git a/wiretap/NEWS b/wiretap/NEWS index bd097fd879..a32437e18c 100644 --- a/wiretap/NEWS +++ b/wiretap/NEWS @@ -1,2 +1,2 @@ Wiretap 0.0.0: -* Initial public release (in ethereal CVS tree) +* Initial public release (in wireshark CVS tree) diff --git a/wiretap/README b/wiretap/README index 56aedd1bd5..b53be11285 100644 --- a/wiretap/README +++ b/wiretap/README @@ -36,7 +36,7 @@ which we could support. Wiretap is very good at reading many file formats, as per #2 above. Wiretap has no filter capability at present; it currently doesn't support packet capture, so it wouldn't be useful there, and filtering -when reading a capture file is done by Ethereal, using a more powerful +when reading a capture file is done by Wireshark, using a more powerful filtering mechanism than that provided by BPF. diff --git a/wiretap/acinclude.m4 b/wiretap/acinclude.m4 index ee60fa5a4c..93938b0e50 100644 --- a/wiretap/acinclude.m4 +++ b/wiretap/acinclude.m4 @@ -1,5 +1,5 @@ dnl Macros that test for specific features. -dnl This file is part of the Autoconf packaging for Ethereal. +dnl This file is part of the Autoconf packaging for Wireshark. dnl Copyright (C) 1998-2000 by Gerald Combs. dnl dnl $Id$ diff --git a/wiretap/file_access.c b/wiretap/file_access.c index c6341c0e84..6ed09f6071 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -155,7 +155,7 @@ static int (*const open_routines[])(wtap *, int *, char **) = { /* Opens a file and prepares a wtap struct. If "do_random" is TRUE, it opens the file twice; the second open allows the application to do random-access I/O without moving - the seek offset for sequential I/O, which is used by Ethereal + the seek offset for sequential I/O, which is used by Wireshark so that it can do sequential I/O to a capture file that's being written to as new packets arrive independently of random I/O done to display protocol trees for packets when they're selected. */ diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 030efeec21..9e4d6bbf6e 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -281,7 +281,7 @@ static const struct { /* * More values used by libpcap 0.5 as DLT_ values and used by the * current CVS version of libpcap in capture file headers. - * They are not yet handled in Ethereal. + * They are not yet handled in Wireshark. * If we get a capture that contains them, we'll implement them. */ { 102, WTAP_ENCAP_SLIP_BSDOS }, @@ -289,7 +289,7 @@ static const struct { #endif /* - * These ones are handled in Ethereal, though. + * These ones are handled in Wireshark, though. */ { 104, WTAP_ENCAP_CHDLC }, /* Cisco HDLC */ { 105, WTAP_ENCAP_IEEE_802_11 }, /* IEEE 802.11 */ |