Ethereal -> Wireshark

svn path=/trunk/; revision=18374

13 files changed, 46 insertions, 46 deletions

diff --git a/tools/Makefile.nmake b/tools/Makefile.nmake
index fa6e388e97..68a6ccc0b2 100644
--- a/tools/Makefile.nmake
+++ b/tools/Makefile.nmake
@@ -1,4 +1,4 @@
-## Makefile for building ethereal.exe with Microsoft C and nmake
+## Makefile for building wireshark.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
 # $Id$
diff --git a/tools/dfilter-test.py b/tools/dfilter-test.py
index 4b4440fc4c..6f2c9bc71a 100755
--- a/tools/dfilter-test.py
+++ b/tools/dfilter-test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-Test-suite to test ethereal's dfilter mechanism.
+Test-suite to test wireshark's dfilter mechanism.
 """
 
 #
diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake
index 51d54a6594..2ca4c7a6b7 100644
--- a/tools/lemon/Makefile.nmake
+++ b/tools/lemon/Makefile.nmake
@@ -1,4 +1,4 @@
-## Makefile for building ethereal.exe with Microsoft C and nmake
+## Makefile for building wireshark.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
 # $Id$
diff --git a/tools/msnchat b/tools/msnchat
index 24ec5855ba..722aee0430 100755
--- a/tools/msnchat
+++ b/tools/msnchat
@@ -25,7 +25,7 @@ import re
 import sys
 import array
 import string
-import EtherealXML
+import WiresharkXML
 import getopt
 
 # By default we output the HTML to stdout
@@ -218,13 +218,13 @@ class CaptureFile:
             "'msnms contains \"X-MMS-IM-Format\"' "
             "-r " + capture_filename, "r")
 
-        EtherealXML.parse_fh(pipe, self.collect_packets)
+        WiresharkXML.parse_fh(pipe, self.collect_packets)
 
         for conv in self.conversations:
             conv.Summarize()
 
     def collect_packets(self, packet):
-        """Collect the packets passed back from EtherealXML.
+        """Collect the packets passed back from WiresharkXML.
         Sort them by TCP/IP conversation, as there could be multiple
         clients per machine."""
         src_ip = packet.get_items("ip.src")[-1].get_show()
diff --git a/tools/pidl/MANIFEST b/tools/pidl/MANIFEST
index 1d6cfc98dc..8dc1096cbb 100644
--- a/tools/pidl/MANIFEST
+++ b/tools/pidl/MANIFEST
@@ -18,8 +18,8 @@ lib/Parse/Pidl/Samba4/SWIG.pm
 lib/Parse/Pidl/Samba4/TDR.pm
 lib/Parse/Pidl/Samba4/Template.pm
 lib/Parse/Pidl/Samba4/EJS.pm
-lib/Parse/Pidl/Ethereal/Conformance.pm
-lib/Parse/Pidl/Ethereal/NDR.pm
+lib/Parse/Pidl/Wireshark/Conformance.pm
+lib/Parse/Pidl/Wireshark/NDR.pm
 lib/Parse/Pidl/Typelist.pm
 lib/Parse/Pidl/Dump.pm
 lib/Parse/Pidl/Compat.pm
diff --git a/tools/pidl/README b/tools/pidl/README
index ddd5fdf319..17d91c54c5 100644
--- a/tools/pidl/README
+++ b/tools/pidl/README
@@ -46,9 +46,9 @@ Parse::Pidl::Samba4::COM::Proxy - Generates proxy object for DCOM (client-side)
 Parse::Pidl::Samba4::COM::Stub - Generates stub call handler for DCOM (server-side)
 Parse::Pidl::Samba4::COM::Header - Generates headers for COM
 
--- Ethereal --
-Parse::Pidl::Ethereal::NDR - Generates a parser for the ethereal network sniffer
-Parse::Pidl::Ethereal::Conformance - Reads conformance files containing additional data for generating Ethereal parsers
+-- Wireshark --
+Parse::Pidl::Wireshark::NDR - Generates a parser for the wireshark network sniffer
+Parse::Pidl::Wireshark::Conformance - Reads conformance files containing additional data for generating Wireshark parsers
 
 -- Utility modules --
 Parse::Pidl::Util - Misc utility functions used by *.pm and pidl.pl
diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
index df9ac064b1..e7a93eb0d8 100644
--- a/tools/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
+++ b/tools/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
@@ -1,5 +1,5 @@
 ###################################################
-# parse an ethereal conformance file
+# parse an wireshark conformance file
 # Copyright jelmer@samba.org 2005
 # released under the GNU GPL
 
@@ -7,15 +7,15 @@
 
 =head1 NAME
 
-Parse::Pidl::Ethereal::Conformance - Conformance file parser for Wireshark
+Parse::Pidl::Wireshark::Conformance - Conformance file parser for Wireshark
 
 =head1 DESCRIPTION
 
-This module supports parsing Ethereal conformance files (*.cnf).
+This module supports parsing Wireshark conformance files (*.cnf).
 
 =head1 FILE FORMAT
 
-Pidl needs additional data for ethereal output. This data is read from 
+Pidl needs additional data for wireshark output. This data is read from 
 so-called conformance files. This section describes the format of these 
 files.
 
@@ -59,7 +59,7 @@ Remove the specified prefix from all function names (if present).
 =item I<PROTOCOL> longname shortname filtername
 
 Change the short-, long- and filter-name for the current interface in
-Ethereal.
+Wireshark.
 
 =item I<FIELD_DESCRIPTION> field desc
 
@@ -82,7 +82,7 @@ Override the text shown when a bitmap boolean value is enabled or disabled.
 
 =cut
 
-package Parse::Pidl::Ethereal::Conformance;
+package Parse::Pidl::Wireshark::Conformance;
 
 require Exporter;
 use vars qw($VERSION);
diff --git a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index bbb3d777d1..f42d73a832 100644
--- a/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/tools/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -10,18 +10,18 @@
 
 =head1 NAME
 
-Parse::Pidl::Ethereal::NDR - Parser generator for Wireshark
+Parse::Pidl::Wireshark::NDR - Parser generator for Wireshark
 
 =cut
 
-package Parse::Pidl::Ethereal::NDR;
+package Parse::Pidl::Wireshark::NDR;
 
 use strict;
 use Parse::Pidl::Typelist qw(getType);
 use Parse::Pidl::Util qw(has_property ParseExpr property_matches make_str);
 use Parse::Pidl::NDR qw(ContainsString GetNextLevel);
 use Parse::Pidl::Dump qw(DumpTypedef DumpFunction);
-use Parse::Pidl::Ethereal::Conformance qw(ReadConformance);
+use Parse::Pidl::Wireshark::Conformance qw(ReadConformance);
 use File::Basename;	
 
 use vars qw($VERSION);
@@ -789,7 +789,7 @@ sub Initialize($)
 }
 
 #####################################################################
-# Generate ethereal parser and header code
+# Generate wireshark parser and header code
 sub Parse($$$$)
 {
 	my($ndr,$idl_file,$h_filename,$cnf_file) = @_;
@@ -834,7 +834,7 @@ sub Parse($$$$)
 	$res{headers} .= "#include \"$h_basename\"\n";
 	pidl_code "";
 
-	# Ethereal protocol registration
+	# Wireshark protocol registration
 
 	ProcessInterface($_) foreach (@$ndr);
 
diff --git a/tools/pidl/pidl b/tools/pidl/pidl
index 00f964267f..f702c31086 100755
--- a/tools/pidl/pidl
+++ b/tools/pidl/pidl
@@ -17,7 +17,7 @@ pidl - An IDL compiler written in Perl
 
 pidl --help
 
-pidl [--outputdir[=OUTNAME]] [--parse-idl-tree] [--dump-idl-tree] [--dump-ndr-tree] [--header[=OUTPUT]] [--ejs[=OUTPUT]] [--swig[=OUTPUT]] [--uint-enums] [--ndr-parser[=OUTPUT]] [--client] [--server] [--dcom-proxy] [--com-header] [--warn-compat] [--quiet] [--verbose] [--template] [--eth-parser[=OUTPUT]] [--diff] [--dump-idl] [--tdr-parser[=OUTPUT]] [--samba3-header[=OUTPUT]] [--samba3-parser=[OUTPUT]] [--samba3-server=[OUTPUT]] [--samba3-template[=OUTPUT]] [--samba3-client[=OUTPUT]] [--samba3-ndr-client[=OUTPUT]] [<idlfile>.idl]...
+pidl [--outputdir[=OUTNAME]] [--parse-idl-tree] [--dump-idl-tree] [--dump-ndr-tree] [--header[=OUTPUT]] [--ejs[=OUTPUT]] [--swig[=OUTPUT]] [--uint-enums] [--ndr-parser[=OUTPUT]] [--client] [--server] [--dcom-proxy] [--com-header] [--warn-compat] [--quiet] [--verbose] [--template] [--ws-parser[=OUTPUT]] [--diff] [--dump-idl] [--tdr-parser[=OUTPUT]] [--samba3-header[=OUTPUT]] [--samba3-parser=[OUTPUT]] [--samba3-server=[OUTPUT]] [--samba3-template[=OUTPUT]] [--samba3-client[=OUTPUT]] [--samba3-ndr-client[=OUTPUT]] [<idlfile>.idl]...
 
 =head1 DESCRIPTION
 
@@ -26,13 +26,13 @@ compatible with the midl compiler. IDL is short for
 "Interface Definition Language".
 
 pidl can generate stubs for DCE/RPC server code, DCE/RPC 
-client code and ethereal dissectors for DCE/RPC traffic.
+client code and wireshark dissectors for DCE/RPC traffic.
 
 IDL compilers like pidl take a description 
 of an interface as their input and use it to generate C 
 (though support for other languages may be added later) code that 
 can use these interfaces, pretty print data sent 
-using these interfaces, or even generate ethereal 
+using these interfaces, or even generate wireshark 
 dissectors that can parse data sent over the 
 wire by these interfaces. 
 
@@ -93,15 +93,15 @@ the interface. Filename defaults to ndr_OUTNAME_s.c.
 Generate stubs for a RPC server that implements the interface. Output will 
 be written to stdout.
 
-=item I<--eth-parser>
+=item I<--ws-parser>
 
-Generate an Ethereal dissector (in C) and header file. The dissector filename
+Generate an Wireshark dissector (in C) and header file. The dissector filename
 defaults to packet-dcerpc-OUTNAME.c while the header filename defaults to 
 packet-dcerpc-OUTNAME.h.
 	
-Pidl will read additional data from an ethereal conformance file if present. 
+Pidl will read additional data from an wireshark conformance file if present. 
 Such a file should have the same location as the IDL file but with the 
-extension I<cnf> rather then I<idl>. See L<Parse::Pidl::Ethereal::Conformance>
+extension I<cnf> rather then I<idl>. See L<Parse::Pidl::Wireshark::Conformance>
 for details on the format of this file.
 
 =item I<--diff>
@@ -369,8 +369,8 @@ usesgetlasterror, vararg, vi_progid, wire_marshal.
 
 =head1 EXAMPLES
 
-	# Generating an ethereal parser
-	$ ./pidl --eth-parser -- atsvc.idl
+	# Generating an wireshark parser
+	$ ./pidl --ws-parser -- atsvc.idl
 	
 	# Generating a TDR parser and header
 	$ ./pidl --tdr-parser --header -- regf.idl
@@ -477,7 +477,7 @@ my($opt_client);
 my($opt_server);
 my($opt_ndr_parser);
 my($opt_tdr_parser);
-my($opt_eth_parser);
+my($opt_ws_parser);
 my($opt_swig);
 my($opt_dcom_proxy);
 my($opt_com_header);
@@ -533,8 +533,8 @@ Samba 3 output:
  --samba3-ndr-client[=OUTF] create client calls for Samba3 
                             using Samba4's NDR code [cli_BASENAME.c]
 
-Ethereal parsers:
- --eth-parser[=OUTFILE]  create ethereal parser and header
+Wireshark parsers:
+ --ws-parser[=OUTFILE]  create wireshark parser and header
 \n";
     exit(0);
 }
@@ -560,7 +560,7 @@ my $result = GetOptions (
 	    'template' => \$opt_template,
 	    'ndr-parser:s' => \$opt_ndr_parser,
 	    'client:s' => \$opt_client,
-	    'eth-parser:s' => \$opt_eth_parser,
+	    'ws-parser:s' => \$opt_ws_parser,
 	    'ejs' => \$opt_ejs,
 	    'diff' => \$opt_diff,
 	    'swig:s' => \$opt_swig,
@@ -655,7 +655,7 @@ sub process_file($)
 
 	$pidl = Parse::Pidl::ODL::ODL2IDL($pidl);
 
-	if (defined($opt_eth_parser) or 
+	if (defined($opt_ws_parser) or 
 	    defined($opt_client) or defined($opt_server) or 
 	    defined($opt_ndr_parser) or defined($opt_ejs) or 
 		defined($opt_dump_ndr_tree) or defined($opt_samba3_header) or 
@@ -744,15 +744,15 @@ $dcom
 
 	}
 
-	if (defined($opt_eth_parser)) {
-	  require Parse::Pidl::Ethereal::NDR;
-	  my($eparser) = ($opt_eth_parser or "$outputdir/packet-dcerpc-$basename.c");
+	if (defined($opt_ws_parser)) {
+	  require Parse::Pidl::Wireshark::NDR;
+	  my($eparser) = ($opt_ws_parser or "$outputdir/packet-dcerpc-$basename.c");
 	  my $eheader = $eparser;
 	  $eheader =~ s/\.c$/\.h/;
 	  my $cnffile = $idl_file;
 	  $cnffile =~ s/\.idl$/\.cnf/;
 
-	  my ($dp, $dh) = Parse::Pidl::Ethereal::NDR::Parse($ndr, $idl_file, $eheader, $cnffile);
+	  my ($dp, $dh) = Parse::Pidl::Wireshark::NDR::Parse($ndr, $idl_file, $eheader, $cnffile);
 	  FileSave($eparser, $dp) if defined($dp);
 	  FileSave($eheader, $dh) if defined($dh);
 	}
diff --git a/tools/pkt-from-core.py b/tools/pkt-from-core.py
index 7810645915..9cd996f689 100755
--- a/tools/pkt-from-core.py
+++ b/tools/pkt-from-core.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-Retrieve a packet from a ethereal/tshark core file
+Retrieve a packet from a wireshark/tshark core file
 and save it in a packet-capture file.
 """
 
@@ -415,7 +415,7 @@ def usage():
 	print ""
 	print "\tGiven an executable file and a core file, this tool"
 	print "\tuses gdb to retrieve the packet that was being dissected"
-	print "\tat the time ethereal/tshark stopped running. The packet"
+	print "\tat the time wireshark/tshark stopped running. The packet"
 	print "\tis saved in the capture_file specified by the -w option."
 	print ""
 	print "\t-v : verbose"
diff --git a/tools/tpg/Makefile.nmake b/tools/tpg/Makefile.nmake
index a3010c1999..d7fdbbd5f5 100644
--- a/tools/tpg/Makefile.nmake
+++ b/tools/tpg/Makefile.nmake
@@ -1,4 +1,4 @@
-## Makefile for building ethereal.exe with Microsoft C and nmake
+## Makefile for building wireshark.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
 # $Id$
diff --git a/tools/wireshark_be.py b/tools/wireshark_be.py
index 17f65b9480..b02648e6f8 100644
--- a/tools/wireshark_be.py
+++ b/tools/wireshark_be.py
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-#    File      : ethereal_be.py
+#    File      : wireshark_be.py
 #
 #    Author    : Frank Singleton (frank.singleton@ericsson.com)
 #
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py
index e5a1b9dcff..e405390da9 100644
--- a/tools/wireshark_gen.py
+++ b/tools/wireshark_gen.py
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# ethereal_gen.py (part of idl2wrs)
+# wireshark_gen.py (part of idl2wrs)
 #
 # Author : Frank Singleton (frank.singleton@ericsson.com)
 #
@@ -36,7 +36,7 @@
 # Description:
 #
 #   Omniidl Back-end which parses an IDL list of "Operation" nodes
-#   passed from ethereal_be2.py and generates "C" code for compiling
+#   passed from wireshark_be2.py and generates "C" code for compiling
 #   as a plugin for the  Wireshark IP Protocol Analyser.
 #
 #