svn commit: samba r16824 - in branches/SAMBA_4_0/source: pidl
pidl/lib/Parse/Pidl pidl/lib/Parse/Pidl/Wireshark utils/man
jelmer at samba.org
jelmer at samba.org
Wed Jul 5 20:49:51 GMT 2006
Author: jelmer
Date: 2006-07-05 20:49:50 +0000 (Wed, 05 Jul 2006)
New Revision: 16824
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16824
Log:
Rename Ethereal -> Wireshark (patch from Joerg Mayer)
Added:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/
Removed:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/
Modified:
branches/SAMBA_4_0/source/pidl/MANIFEST
branches/SAMBA_4_0/source/pidl/README
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
branches/SAMBA_4_0/source/pidl/pidl
branches/SAMBA_4_0/source/utils/man/ndrdump.1.xml
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/MANIFEST
===================================================================
--- branches/SAMBA_4_0/source/pidl/MANIFEST 2006-07-05 15:29:31 UTC (rev 16823)
+++ branches/SAMBA_4_0/source/pidl/MANIFEST 2006-07-05 20:49:50 UTC (rev 16824)
@@ -26,8 +26,8 @@
lib/Parse/Pidl/Samba4/Template.pm
lib/Parse/Pidl/Samba4/EJS.pm
lib/Parse/Pidl/Samba4.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
Modified: branches/SAMBA_4_0/source/pidl/README
===================================================================
--- branches/SAMBA_4_0/source/pidl/README 2006-07-05 15:29:31 UTC (rev 16823)
+++ branches/SAMBA_4_0/source/pidl/README 2006-07-05 20:49:50 UTC (rev 16824)
@@ -46,9 +46,9 @@
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
Copied: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark (from rev 16823, branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal)
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm 2006-07-05 15:29:31 UTC (rev 16823)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm 2006-07-05 20:49:50 UTC (rev 16824)
@@ -1,5 +1,5 @@
###################################################
-# parse an ethereal conformance file
+# parse an Wireshark conformance file
# Copyright jelmer at samba.org 2005
# released under the GNU GPL
@@ -7,15 +7,15 @@
=head1 NAME
-Parse::Pidl::Ethereal::Conformance - Conformance file parser for Ethereal
+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 @@
=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
@@ -89,7 +89,7 @@
=cut
-package Parse::Pidl::Ethereal::Conformance;
+package Parse::Pidl::Wireshark::Conformance;
require Exporter;
use vars qw($VERSION);
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Ethereal/NDR.pm 2006-07-05 15:29:31 UTC (rev 16823)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm 2006-07-05 20:49:50 UTC (rev 16824)
@@ -10,18 +10,18 @@
=head1 NAME
-Parse::Pidl::Ethereal::NDR - Parser generator for Ethereal
+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);
@@ -822,7 +822,7 @@
}
#####################################################################
-# Generate ethereal parser and header code
+# Generate Wireshark parser and header code
sub Parse($$$$)
{
my($ndr,$idl_file,$h_filename,$cnf_file) = @_;
@@ -841,9 +841,9 @@
from $idl_file and $cnf_file.
Pidl is a perl based IDL compiler for DCE/RPC idl files.
- It is maintained by the Samba team, not the Ethereal team.
+ It is maintained by the Samba team, not the Wireshark team.
Instructions on how to download and install Pidl can be
- found at http://wiki.ethereal.com/Pidl
+ found at http://wiki.wireshark.org/Pidl
*/
";
@@ -867,7 +867,7 @@
$res{headers} .= "#include \"$h_basename\"\n";
pidl_code "";
- # Ethereal protocol registration
+ # Wireshark protocol registration
ProcessInterface($_) foreach (@$ndr);
Modified: branches/SAMBA_4_0/source/pidl/pidl
===================================================================
--- branches/SAMBA_4_0/source/pidl/pidl 2006-07-05 15:29:31 UTC (rev 16823)
+++ branches/SAMBA_4_0/source/pidl/pidl 2006-07-05 20:49:50 UTC (rev 16824)
@@ -17,7 +17,7 @@
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 @@
"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 @@
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 than I<idl>. See L<Parse::Pidl::Ethereal::Conformance>
+extension I<cnf> rather than I<idl>. See L<Parse::Pidl::Wireshark::Conformance>
for details on the format of this file.
=item I<--diff>
@@ -369,8 +369,8 @@
=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
@@ -384,7 +384,7 @@
=head1 SEE ALSO
L<http://msdn.microsoft.com/library/en-us/rpc/rpc/field_attributes.asp>,
-L<http://wiki.ethereal.com/DCE/RPC>,
+L<http://wiki.wireshark.org/DCE/RPC>,
L<http://www.samba.org/>,
L<yapp(1)>
@@ -477,7 +477,7 @@
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 @@
--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 @@
'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 @@
$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 @@
}
- 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);
}
Modified: branches/SAMBA_4_0/source/utils/man/ndrdump.1.xml
===================================================================
--- branches/SAMBA_4_0/source/utils/man/ndrdump.1.xml 2006-07-05 15:29:31 UTC (rev 16823)
+++ branches/SAMBA_4_0/source/utils/man/ndrdump.1.xml 2006-07-05 20:49:50 UTC (rev 16824)
@@ -48,7 +48,7 @@
<para>The primary function of ndrdump is debugging Samba's internal
DCE/RPC parsing functions. The file being parsed is usually
- one exported by ethereal's <quote>Export selected packet bytes</quote>
+ one exported by wiresharks <quote>Export selected packet bytes</quote>
function.</para>
<para>The context argument can be used to load context data from the request
@@ -65,7 +65,7 @@
<refsect1>
<title>SEE ALSO</title>
- <para>ethereal, pidl</para>
+ <para>wireshark, pidl</para>
</refsect1>
More information about the samba-cvs
mailing list