changes here. It compiles OK on OS X, but hasn't been tested anywhere else.
svn path=/trunk/; revision=18260
By default the hex-dump-to-capture file conversion program
is built. Use this switch to avoid building it.
- --disable-idl2eth
+ --disable-idl2wrs
By default the IDL-to-ethereal-dissector-source-code converter
is built. Use this switch to avoid building it.
# the "man{section}_MANS" variables.
#
bin_PROGRAMS = @ethereal_bin@ @capinfos_bin@ @editcap_bin@ @mergecap_bin@ @tethereal_bin@ @dftest_bin@ @randpkt_bin@ @text2pcap_bin@ @dumpcap_bin@
-bin_SCRIPTS = @idl2eth_bin@
-man1_MANS = @ethereal_man@ @capinfos_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @dumpcap_man@ @idl2eth_man@
+bin_SCRIPTS = @idl2wrs_bin@
+man1_MANS = @ethereal_man@ @capinfos_man@ @editcap_man@ @mergecap_man@ @tethereal_man@ @text2pcap_man@ @dumpcap_man@ @idl2wrs_man@
man4_MANS = @etherealfilter_man@
man_MANS =
EXTRA_PROGRAMS = ethereal tethereal capinfos editcap mergecap dftest \
randpkt text2pcap dumpcap
-EXTRA_SCRIPTS = idl2eth
+EXTRA_SCRIPTS = tools/idl2wrs
#
# Ethereal configuration files are put in $(pkgdatadir).
#
pkgdata_DATA = AUTHORS-SHORT manuf ethereal.html tethereal.html \
ethereal-filter.html capinfos.html editcap.html \
- idl2eth.html mergecap.html text2pcap.html dumpcap.html \
+ idl2wrs.html mergecap.html text2pcap.html dumpcap.html \
cfilters colorfilters dfilters
#
ethereal_additional_libs = \
gtk/libui.a \
wiretap/libwiretap.la \
- epan/libethereal.la
+ epan/libwireshark.la
# This is the automake dependency variable for the executable
ethereal_DEPENDENCIES = \
# linked into the tethereal executable.
tethereal_additional_libs = \
wiretap/libwiretap.la \
- epan/libethereal.la
+ epan/libwireshark.la
# This is the automake dependency variable for the executable
tethereal_DEPENDENCIES = \
dftest_additional_libs = \
wiretap/libwiretap.la \
- epan/libethereal.la
+ epan/libwireshark.la
dftest_DEPENDENCIES = \
$(ethereal_optional_objects) \
CLEANFILES = \
svnversion.h \
@rdps_bin@ \
- idl2eth \
+ idl2wrs \
*~ \
vgcore.pid*
doc/README.capture \
doc/README.design \
doc/README.developer \
- doc/README.idl2eth \
+ doc/README.idl2wrs \
doc/README.malloc \
doc/README.plugins \
doc/README.regression \
doc/editcap.pod \
doc/ethereal-filter.pod.template \
doc/ethereal.pod \
- doc/idl2eth.pod \
+ doc/idl2wrs.pod \
doc/mergecap.pod \
doc/randpkt.txt \
doc/tethereal.pod \
doxygen.cfg.in \
dumpcap.c \
editcap.c \
- epan/libethereal.def \
+ epan/libwireshark.def \
ethereal_be.py \
ethereal_gen.py \
ethereal.desktop \
- idl2eth.sh \
image/Ethereal.icns \
image/Makefile.nmake \
image/README.image \
image/hi48-app-ethereal.png \
image/icon-ethereal.xpm \
image/icon-excl.xpm \
- image/libethereal.rc.in \
+ image/libwireshark.rc.in \
image/lo16-app-ethereal.png \
image/lo32-app-ethereal.png \
image/lo48-app-ethereal.png \
(cd doc ; \
$(MAKE) ../editcap.1 )
-idl2eth.1: doc/idl2eth.pod
+idl2wrs.1: doc/idl2wrs.pod
(cd doc ; \
- $(MAKE) ../idl2eth.1 )
+ $(MAKE) ../idl2wrs.1 )
mergecap.1: doc/mergecap.pod
(cd doc ; \
(cd doc ; \
$(MAKE) ../editcap.html )
-idl2eth.html: doc/idl2eth.pod
+idl2wrs.html: doc/idl2wrs.pod
(cd doc ; \
- $(MAKE) ../idl2eth.html )
+ $(MAKE) ../idl2wrs.html )
mergecap.html: doc/mergecap.pod
(cd doc ; \
!IFDEF HHC_DIR
$(HHC_DIR)\lib\htmlhelp.lib \
!ENDIF
-!IFDEF ENABLE_LIBETHEREAL
- epan\libethereal.lib \
+!IFDEF ENABLE_LIBWIRESHARK
+ epan\libwireshark.lib \
!ELSE
epan\dissectors\dissectors.lib \
epan\ethereal.lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
$(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
-!IFDEF ENABLE_LIBETHEREAL
- epan\libethereal.lib \
+!IFDEF ENABLE_LIBWIRESHARK
+ epan\libwireshark.lib \
!ELSE
epan\dissectors\dissectors.lib \
epan\ethereal.lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
$(NET_SNMP_DIR)\win32\lib\release\netsnmp.lib \
-!IFDEF ENABLE_LIBETHEREAL
- epan\libethereal.lib \
+!IFDEF ENABLE_LIBWIRESHARK
+ epan\libwireshark.lib \
!ELSE
epan\dissectors\dissectors.lib \
epan\ethereal.lib \
EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe \
capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe dumpcap.exe
-RESOURCES=image\ethereal.res image\libethereal.res image\tethereal.res \
+RESOURCES=image\ethereal.res image\libwireshark.res image\tethereal.res \
image\capinfos.res image\editcap.res image\mergecap.res \
image\text2pcap.res image\wiretap.res image\dumpcap.res
-e "s/@HAVE_PCAP_DATALINK_NAME_TO_VAL@/$(PCAP_DATALINK_NAME_TO_VAL_CONFIG)/" \
-e "s/@HAVE_PCAP_DATALINK_VAL_TO_NAME@/$(PCAP_DATALINK_VAL_TO_NAME_CONFIG)/" \
-e "s/@HAVE_PCAP_BREAKLOOP@/$(PCAP_BREAKLOOP_CONFIG)/" \
- -e "s/@HAVE_LIBETHEREALDLL@/$(LIBETHEREAL_CONFIG)/" \
+ -e "s/@HAVE_LIBWIRESHARKDLL@/$(LIBWIRESHARK_CONFIG)/" \
-e "s/@WPCAP_CONSTIFIED@/$(WPCAP_CONSTIFIED_CONFIG)/" \
-e "s/@HAVE_GNUTLS@/$(GNUTLS_CONFIG)/" \
-e "s/@HAVE_LUA@/$(LUA_CONFIG)/" \
AUTHORS-SHORT-FORMAT \
dftest.obj dftest.exe randpkt.obj randpkt.ext dumpcap.obj \
doxygen.cfg \
- $(RESOURCES) libethereal.dll wiretap-$(WTAP_VERSION).dll
+ $(RESOURCES) libwireshark.dll wiretap-$(WTAP_VERSION).dll
cd asn1
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ..
install-required-deps:
set copycmd=/y
xcopy wiretap\wiretap-$(WTAP_VERSION).dll . /d
-!IFDEF ENABLE_LIBETHEREAL
- xcopy epan\libethereal.dll . /d
+!IFDEF ENABLE_LIBWIRESHARK
+ xcopy epan\libwireshark.dll . /d
!ENDIF
xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll . /d
xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll . /d
X11 and X11 SDK that come with Mac OS X 10.3[.x] are sufficient to build
and run Ethereal.
-The changes to enable libwiretap and libethereal being built as shared
+The changes to enable libwiretap and libwireshark being built as shared
libraries have broken shared gtk1 builds on Mac OS X. The GLib 1.x and
GTK+ 1.x release tarballs were built with an older version of libtool
that didn't support shared libraries on Mac OS X, so you can't build and
#define HAVE_PLUGINS 1
#define PLUGINS_NEED_ADDRESS_TABLE 1
-/* Plugins can also use the import library of libethereal.dll instead
+/* Plugins can also use the import library of libwireshark.dll instead
of the old API. In that case we undefine PLUGINS_NEED_ADDRESS_TABLE
for the plugin. We don't undefine PLUGINS_NEED_ADDRESS_TABLE globally.
Thus Ethereal will be still able to load plugins using the old API.
- The macro HAVE_WIN32_LIBETHEREAL_LIB has to be defined in plugin's
+ The macro HAVE_WIN32_LIBWIRESHARK_LIB has to be defined in plugin's
makefile.nmake. A template is available in doc/README.plugins */
-#ifdef HAVE_WIN32_LIBETHEREAL_LIB
+#ifdef HAVE_WIN32_LIBWIRESHARK_LIB
#undef PLUGINS_NEED_ADDRESS_TABLE
#endif
@HAVE_PCAP_DATALINK_NAME_TO_VAL@
@HAVE_PCAP_DATALINK_VAL_TO_NAME@
@WPCAP_CONSTIFIED@
-@HAVE_LIBETHEREALDLL@
+@HAVE_LIBWIRESHARKDLL@
/* availability of pcap_freecode() is handled at runtime */
#define HAVE_PCAP_FREECODE 1
/* define macro for importing variables from an dll
- * it depends on HAVE_LIBETHEREAL and _NEED_VAR_IMPORT_
+ * it depends on HAVE_LIBWIRESHARK and _NEED_VAR_IMPORT_
*/
-#if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBETHEREALDLL)
+#if defined (_NEED_VAR_IMPORT_) && defined (HAVE_LIBWIRESHARKDLL)
# define ETH_VAR_IMPORT __declspec(dllimport) extern
#else
# define ETH_VAR_IMPORT extern
# It looks like we'll have to call "set copycmd=/y" before we run xcopy.
COPYCMD=/y
-# If you don't want to build libethereal.dll, you should comment out the
+# If you don't want to build libwireshark.dll, you should comment out the
# following line. (Note: for plugin support this option must stay activated)
-ENABLE_LIBETHEREAL=USE
+ENABLE_LIBWIRESHARK=USE
-!IFDEF ENABLE_LIBETHEREAL
-# Uncomment next line to link plugins with the import library of libethereal.dll
-LINK_PLUGINS_WITH_LIBETHEREAL=USE
+!IFDEF ENABLE_LIBWIRESHARK
+# Uncomment next line to link plugins with the import library of libwireshark.dll
+LINK_PLUGINS_WITH_LIBWIRESHARK=USE
!ENDIF
#
NETTLE_CONFIG=
!ENDIF
-!IFDEF ENABLE_LIBETHEREAL
-LIBETHEREAL_CONFIG=^#define HAVE_LIBETHEREALDLL 1
+!IFDEF ENABLE_LIBWIRESHARK
+LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1
!ELSE
-LIBETHEREAL_CONFIG=
+LIBWIRESHARK_CONFIG=
!ENDIF
!IFDEF GNUTLS_DIR
AC_SUBST(text2pcap_bin)
AC_SUBST(text2pcap_man)
-# Enable/disable idl2eth
+# Enable/disable idl2wrs
-AC_ARG_ENABLE(idl2eth,
-[ --enable-idl2eth build idl2eth. [default=yes]],enable_idl2eth=$enableval,enable_idl2eth=yes)
+AC_ARG_ENABLE(idl2wrs,
+[ --enable-idl2wrs build idl2wrs. [default=yes]],enable_idl2wrs=$enableval,enable_idl2wrs=yes)
-if test "x$enable_idl2eth" = "xyes" ; then
- idl2eth_bin="idl2eth"
- idl2eth_man="idl2eth.1"
+if test "x$enable_idl2wrs" = "xyes" ; then
+ idl2wrs_bin="idl2wrs"
+ idl2wrs_man="idl2wrs.1"
else
- idl2eth_bin=""
- idl2eth_man=""
+ idl2wrs_bin=""
+ idl2wrs_man=""
fi
-AC_SUBST(idl2eth_bin)
-AC_SUBST(idl2eth_man)
+AC_SUBST(idl2wrs_bin)
+AC_SUBST(idl2wrs_man)
# Enable/disable dftest
#
# The plugin dissectors reside in ./plugins/PROTO/
#
-PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS"
+PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS"
AC_SUBST(PLUGIN_LIBS)
dnl libtool defs
echo " Build dumpcap : $enable_dumpcap"
echo " Build mergecap : $enable_mergecap"
echo " Build text2pcap : $enable_text2pcap"
-echo " Build idl2eth : $enable_idl2eth"
+echo " Build idl2wrs : $enable_idl2wrs"
echo " Build randpkt : $enable_randpkt"
echo " Build dftest : $enable_dftest"
echo ""
/usr/bin/editcap
/usr/bin/mergecap
/usr/bin/text2pcap
-/usr/lib/ethereal/libethereal.so.0
-/usr/lib/ethereal/libethereal.so.0.0.1
+/usr/lib/ethereal/libwireshark.so.0
+/usr/lib/ethereal/libwireshark.so.0.0.1
/usr/lib/ethereal/libwiretap.so.0
/usr/lib/ethereal/libwiretap.so.0.0.1
/usr/lib/ethereal/plugins/*
/usr/bin/editcap
/usr/bin/mergecap
/usr/bin/text2pcap
-/usr/lib/ethereal/libethereal.so.0
-/usr/lib/ethereal/libethereal.so.0.0.1
+/usr/lib/ethereal/libwireshark.so.0
+/usr/lib/ethereal/libwireshark.so.0.0.1
/usr/lib/ethereal/libwiretap.so.0
/usr/lib/ethereal/libwiretap.so.0.0.1
/usr/lib/ethereal/plugins/*
doc/README.design
doc/README.developer
-doc/README.idl2eth
+doc/README.idl2wrs
doc/README.plugins
doc/README.design
doc/README.developer
-doc/README.idl2eth
+doc/README.idl2wrs
doc/README.plugins
doc/README.design
doc/README.developer
-doc/README.idl2eth
+doc/README.idl2wrs
doc/README.plugins
-/usr/bin/idl2eth
+/usr/bin/idl2wrs
/usr/bin/idl2deb
/usr/bin/asn2deb
-/usr/lib/ethereal/libethereal.so
-/usr/lib/ethereal/libethereal.la
+/usr/lib/ethereal/libwireshark.so
+/usr/lib/ethereal/libwireshark.la
/usr/lib/ethereal/libwiretap.so
/usr/lib/ethereal/libwiretap.la
/usr/lib/python2.3/*
/usr/include/ethereal/*
-/usr/bin/idl2eth
+/usr/bin/idl2wrs
/usr/bin/idl2deb
/usr/bin/asn2deb
-/usr/lib/ethereal/libethereal.so
-/usr/lib/ethereal/libethereal.la
+/usr/lib/ethereal/libwireshark.so
+/usr/lib/ethereal/libwireshark.la
/usr/lib/ethereal/libwiretap.so
/usr/lib/ethereal/libwiretap.la
/usr/lib/python2.3/*
/usr/include/ethereal/*
-/usr/bin/idl2eth
+/usr/bin/idl2wrs
/usr/lib/python2.2/*
/usr/include/ethereal/*
/usr/lib/libwiretap.a
-idl2eth.1
+idl2wrs.1
idl2deb.1
asn2deb.1
-idl2eth.1
+idl2wrs.1
idl2deb.1
asn2deb.1
-idl2eth.1
+idl2wrs.1
06_giop-buffer
07_gcc4
08_ethereal-desktop-menu
-09_idl2eth
+09_idl2wrs
10_ethereal_gen
11_diameter_vendors
--noindex \
$(srcdir)/editcap.pod > ../editcap.html
-../idl2eth.1: idl2eth.pod ../config.h
+../idl2wrs.1: idl2wrs.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
- $(srcdir)/idl2eth.pod > ../idl2eth.1
+ $(srcdir)/idl2wrs.pod > ../idl2wrs.1
-../idl2eth.html: idl2eth.pod ../config.h
+../idl2wrs.html: idl2wrs.pod ../config.h
$(POD2HTML) \
- --title="idl2eth - The Wireshark Network Analyzer $(VERSION)" \
+ --title="idl2wrs - The Wireshark Network Analyzer $(VERSION)" \
--noindex \
- $(srcdir)/idl2eth.pod > ../idl2eth.html
+ $(srcdir)/idl2wrs.pod > ../idl2wrs.html
../mergecap.1: mergecap.pod ../config.h
$(POD2MAN) \
../text2pcap.html \
../dumpcap.1 \
../dumpcap.html \
- ../idl2eth.1 \
- ../idl2eth.html
+ ../idl2wrs.1 \
+ ../idl2wrs.html
DISTCLEANFILES = \
pod2htmi.tmp \
include ../config.nmake
doc: ethereal.html tethereal.html ethereal-filter.html capinfos.html \
- editcap.html idl2eth.html mergecap.html text2pcap.html dumpcap.html
+ editcap.html idl2wrs.html mergecap.html text2pcap.html dumpcap.html
man: ethereal.1 tethereal.1 ethereal-filter.4 capinfos.1 editcap.1 \
- idl2eth.1 mergecap.1 text2pcap.1 dumpcap.1
+ idl2wrs.1 mergecap.1 text2pcap.1 dumpcap.1
ethereal-tmp.pod: ethereal.pod ../AUTHORS-SHORT-FORMAT
copy /B ethereal.pod + ..\AUTHORS-SHORT-FORMAT ethereal-tmp.pod
--noindex \
editcap.pod > editcap.html
-idl2eth.1: idl2eth.pod ../config.h
+idl2wrs.1: idl2wrs.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
- idl2eth.pod > idl2eth.1
+ idl2wrs.pod > idl2wrs.1
-idl2eth.html: idl2eth.pod ../config.h
+idl2wrs.html: idl2wrs.pod ../config.h
$(POD2HTML) \
- --title="idl2eth - The Wireshark Network Analyzer $(VERSION)" \
+ --title="idl2wrs - The Wireshark Network Analyzer $(VERSION)" \
--noindex \
- idl2eth.pod > idl2eth.html
+ idl2wrs.pod > idl2wrs.html
mergecap.1: mergecap.pod ../config.h
$(POD2MAN) \
rm -f ethereal-filter.html ethereal-filter.4 ethereal-filter.pod
rm -f capinfos.html capinfos.1
rm -f editcap.html editcap.1
- rm -f idl2eth.html idl2eth.1
+ rm -f idl2wrs.html idl2wrs.1
rm -f mergecap.html mergecap.1
rm -f text2pcap.html text2pcap.1
rm -f dumpcap.html dumpcap.1
What is it ?
============
-As you have probably guessed from the name, "idl2eth" takes a
+As you have probably guessed from the name, "idl2wrs" takes a
user specified IDL file and attempts to build a dissector that
can decode the IDL traffic over GIOP. The resulting file is
"C" code, that should compile okay as an ethereal dissector.
-idl2eth basically parses the data struct given to it by
+idl2wrs basically parses the data struct given to it by
the omniidl compiler, and using the GIOP API available in packet-giop.[ch],
generates get_CDR_xxx calls to decode the CORBA traffic on the wire.
It consists of 4 main files.
-README.idl2eth - This document
+README.idl2wrs - This document
ethereal_be.py - The main compiler backend
ethereal_gen.py - A helper class, that generates the C code.
-idl2eth - A simple shell script wrapper that the end user should
+idl2wrs - A simple shell script wrapper that the end user should
use to generate the dissector from the IDL file(s).
Why did you do this ?
the case with "Ethereal" (http://www.ethereal.com)
-How to use idl2eth
+How to use idl2wrs
==================
-To use the idl2eth to generate ethereal dissectors, you
+To use the idl2wrs to generate ethereal dissectors, you
need the following.
http://omniorb.sourceforge.net/
3 Of course you need ethereal installed to compile the
- code an tweak it if required. idl2eth is part of the
+ code an tweak it if required. idl2wrs is part of the
standard Ethereal distribution
1. To write the C code to stdout.
- idl2eth <your file.idl>
+ idl2wrs <your file.idl>
- eg: idl2eth echo.idl
+ eg: idl2wrs echo.idl
2. To write to a file, just redirect the output.
- idl2eth echo.idl > packet-test-idl.c
+ idl2wrs echo.idl > packet-test-idl.c
You may wish to comment out the register_giop_user_module() code
and that will leave you with heuristic dissection.
=head1 NAME
-idl2eth - CORBA IDL to Ethereal Plugin Generator
+idl2wrs - CORBA IDL to Ethereal Plugin Generator
=head1 SYNOPSYS
-B<idl2eth> filename
+B<idl2wrs> filename
=head1 DESCRIPTION
-B<idl2eth> is a program that takes a user specified B<CORBA IDL>
+B<idl2wrs> is a program that takes a user specified B<CORBA IDL>
file and generates B<"C"> source code for an B<Ethereal> "plugin".
This resulting file can be compiled as an B<Ethereal> plugin, and
used to monitor B<GIOP/IIOP> traffic that is using this IDL.
-B<idl2
eth> is actually a shell script wrapper for two B<Python> programs.
+B<idl2
wrs> is actually a shell script wrapper for two B<Python> programs.
These programs are:
=back
-B<idl2eth> supports heuristic dissection of GIOP/IIOP traffic,
+B<idl2wrs> supports heuristic dissection of GIOP/IIOP traffic,
and some experimental code for explicit dissection, based on
Object Key <-> Repository Id mapping.
However, code for heuristic based plugins is
=head1 OPTIONS
-Currently there are no options. B<idl2eth> can be invoked as follows.
+Currently there are no options. B<idl2wrs> can be invoked as follows.
1. To write the C code to stdout.
- idl2eth <your_file.idl>
+ idl2wrs <your_file.idl>
- eg: idl2eth echo.idl
+ eg: idl2wrs echo.idl
2. To write to a file, just redirect the output.
- idl2eth echo.idl > packet-test.c
+ idl2wrs echo.idl > packet-test.c
=head1 ENVIRONMENT
-B<idl2eth> will look for B<ethereal_be.py> and B<ethereal_gen.py> in
+B<idl2wrs> will look for B<ethereal_be.py> and B<ethereal_gen.py> in
B<$PYTHONPATH/site-packages/> and if not found, will try the current
directory B<./>
-The B<-p> option passed to omniidl (inside B<idl2eth>) indicates where
+The B<-p> option passed to omniidl (inside B<idl2wrs>) indicates where
B<ethereal_be.py> and B<ethereal_gen.py> will be searched. This may
need tweaking if you place these files somewhere else.
=head1 NOTES
-B<idl2eth> (including B<ethereal_be.py> and B<ethereal_gen.py>) are part of
+B<idl2wrs> (including B<ethereal_be.py> and B<ethereal_gen.py>) are part of
the B<Ethereal> distribution. The latest version of B<Ethereal> can
be found at B<http://www.ethereal.com>.
-B<idl2eth> uses B<omniidl>, and IDL parser, and can be found at
+B<idl2wrs> uses B<omniidl>, and IDL parser, and can be found at
B<http://omniorb.sourceforge.net/>
=head1 TODO
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
OBJECTS=foo.obj
</variablelist>
</section>
- <section id="AppToolsidl2eth" >
- <title><command>idl2eth</command>:
+ <section id="AppToolsidl2wrs" >
+ <title><command>idl2wrs</command>:
Creating dissectors from Corba IDL files
</title>
<para>
- In an ideal world idl2eth would be mentioned in the users guide
+ In an ideal world idl2wrs would be mentioned in the users guide
in passing and documented in the developers guide. As the
developers guide
has not yet been completed it will be documented here.
<title>What is it?</title>
<para>
As you have probably guessed from the name,
- <command>idl2eth</command> takes a
+ <command>idl2wrs</command> takes a
user specified IDL file and attempts to build a dissector that
can decode the IDL traffic over GIOP. The resulting file is
"C" code, that should compile okay as an ethereal dissector.
</para>
<para>
- <command>idl2eth</command> basically parses the data struct given to
+ <command>idl2wrs</command> basically parses the data struct given to
it by the omniidl compiler, and using the GIOP API available in
packet-giop.[ch], generates get_CDR_xxx calls to decode the
CORBA traffic on the wire.
</para>
<para>It consists of 4 main files.</para>
<variablelist>
- <varlistentry><term><filename>README.idl2eth</filename></term>
+ <varlistentry><term><filename>README.idl2wrs</filename></term>
<listitem>
<para>This document</para>
</listitem>
<para>A helper class, that generates the C code.</para>
</listitem>
</varlistentry>
- <varlistentry><term><filename>idl2eth</filename></term>
+ <varlistentry><term><filename>idl2wrs</filename></term>
<listitem>
<para> A simple shell script wrapper that the end user should
use to generate the dissector from the IDL file(s).</para>
)
</para>
</section>
- <section><title>How to use idl2eth</title>
+ <section><title>How to use idl2wrs</title>
<para>
- To use the idl2eth to generate ethereal dissectors, you
+ To use the idl2wrs to generate ethereal dissectors, you
need the following:
</para>
<orderedlist>
- <title>Prerequisites to using idl2eth</title>
+ <title>Prerequisites to using idl2wrs</title>
<listitem>
<para>
Python must be installed. See
<listitem>
<para>
Of course you need ethereal installed to compile the
- code and tweak it if required. idl2eth is part of the
+ code and tweak it if required. idl2wrs is part of the
standard Wireshark distribution
</para>
</listitem>
</orderedlist>
<para>
- To use idl2eth to generate an ethereal dissector from an idl file
+ To use idl2wrs to generate an ethereal dissector from an idl file
use the following procedure:
</para>
<orderedlist>
<listitem>
<para>
To write the C code to stdout.
- <programlisting>idl2eth <your file.idl></programlisting>
- eg: <programlisting>idl2eth echo.idl</programlisting>
+ <programlisting>idl2wrs <your file.idl></programlisting>
+ eg: <programlisting>idl2wrs echo.idl</programlisting>
</para>
</listitem>
<listitem>
<para>
To write to a file, just redirect the output.
- <programlisting>idl2eth echo.idl > packet-test-idl.c</programlisting>
+ <programlisting>idl2wrs echo.idl > packet-test-idl.c</programlisting>
You may wish to comment out the register_giop_user_module() code
and that will leave you with heuristic dissection.
</para>
</listitem>
<listitem>
<para>
- Frank Singleton from whose <filename>README.idl2eth</filename>
- <xref linkend="AppToolsidl2eth"/> is derived.
+ Frank Singleton from whose <filename>README.idl2wrs</filename>
+ <xref linkend="AppToolsidl2wrs"/> is derived.
</para>
</listitem>
</itemizedlist>
ACLOCAL_AMFLAGS = `../aclocal-flags`
-lib_LTLIBRARIES = libethereal.la
-libethereal_la_LDFLAGS = -version-info 0:1:0
+lib_LTLIBRARIES = libwireshark.la
+libwireshark_la_LDFLAGS = -version-info 0:1:0
include Makefile.common
INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(LEMON)
-libethereal_la_SOURCES = \
- $(LIBETHEREAL_SRC) \
- $(LIBETHEREAL_INCLUDES)
+libwireshark_la_SOURCES = \
+ $(LIBWIRESHARK_SRC) \
+ $(LIBWIRESHARK_INCLUDES)
-EXTRA_libethereal_la_SOURCES = \
+EXTRA_libwireshark_la_SOURCES = \
g_ascii_strtoull.c \
g_ascii_strtoull.h \
inet_aton.c \
dtd_parse.l \
dtd_preparse.l \
enterprise-numbers \
- libethereal.def \
+ libwireshark.def \
Makefile.common \
Makefile.nmake \
make-sminmpec.pl \
doxygen.cfg.in
CLEANFILES = \
- libethereal.a \
- libethereal.la \
+ libwireshark.a \
+ libwireshark.la \
*~
DISTCLEANFILES = \
#
# Add the object files for missing routines, if any.
#
-libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
-libethereal_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
+libwireshark_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la @ADNS_LIBS@ @LIBGNUTLS_LIBS@ @KRB5_LIBS@ @SNMP_LIBS@ @SSL_LIBS@ -lm
+libwireshark_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
tvbtest: tvbtest.o tvbuff.o except.o strutil.o
$(LINK) $^ $(GLIB_LIBS) -lz
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-LIBETHEREAL_SRC = \
+LIBWIRESHARK_SRC = \
addr_and_mask.c \
addr_resolv.c \
adler32.c \
xdlc.c \
xmlstub.c
-LIBETHEREAL_INCLUDES = \
+LIBWIRESHARK_INCLUDES = \
addr_and_mask.h \
addr_resolv.h \
address.h \
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
-# For use when making libethereal.dll
-libethereal_LIBS = \
+# For use when making libwireshark.dll
+libwireshark_LIBS = \
$(GLIB_LIBS) \
$(ADNS_LIBS) \
$(PCRE_LIBS) \
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
-LIBETHEREAL_OBJECTS = $(LIBETHEREAL_SRC:.c=.obj)
+LIBWIRESHARK_OBJECTS = $(LIBWIRESHARK_SRC:.c=.obj)
EXTRA_OBJECTS = \
# snprintf.obj \
DOXYGEN_DEP=doxygen
!ENDIF
-!IFDEF ENABLE_LIBETHEREAL
-all: ftypes dfilter dissectors libethereal.dll
+!IFDEF ENABLE_LIBWIRESHARK
+all: ftypes dfilter dissectors libwireshark.dll
!ELSE
all: ftypes dfilter dissectors ethereal.lib
!ENDIF
-# For use when making libethereal.dll
-libethereal.lib: libethereal.dll
-libethereal.exp: libethereal.dll
+# For use when making libwireshark.dll
+libwireshark.lib: libwireshark.dll
+libwireshark.exp: libwireshark.dll
-libethereal.dll: ..\config.h $(LIBETHEREAL_OBJECTS) libethereal.def ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \
- ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib ..\image\libethereal.res
- @echo Linking libethereal.dll
+libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \
+ ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib ..\image\libwireshark.res
+ @echo Linking libwireshark.dll
$(link) $(dlllflags) $(conlibsdll) \
$(LOCAL_LDFLAGS) \
- /DEF:libethereal.def /OUT:libethereal.dll \
- /IMPLIB:libethereal.lib $(LIBETHEREAL_OBJECTS) \
- $(libethereal_LIBS) ..\image\libethereal.res \
+ /DEF:libwireshark.def /OUT:libwireshark.dll \
+ /IMPLIB:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \
+ $(libwireshark_LIBS) ..\image\libwireshark.res \
dissectors\register.obj \
$(EXTRA_OBJECTS)
-ethereal.lib : ..\config.h $(LIBETHEREAL_OBJECTS) ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \
+ethereal.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) ftypes dfilter dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \
ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib
- link /lib /out:ethereal.lib $(LIBETHEREAL_OBJECTS) \
+ link /lib /out:ethereal.lib $(LIBWIRESHARK_OBJECTS) \
$(EXTRA_OBJECTS)
..\config.h : ..\config.h.win32 ..\config.nmake
cd epan
clean:
- rm -f $(LIBETHEREAL_OBJECTS) $(EXTRA_OBJECTS) ethereal.lib libethereal.dll libethereal.lib libethereal.exp $(PDB_FILE) doxygen.cfg html/*.*
+ rm -f $(LIBWIRESHARK_OBJECTS) $(EXTRA_OBJECTS) ethereal.lib libwireshark.dll libwireshark.lib libwireshark.exp $(PDB_FILE) doxygen.cfg html/*.*
if exist html rmdir html
cd ftypes
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
/* dfilter_error_msg is NULL if there was no error during dfilter_compile,
* otherwise it points to a displayable error message. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT gchar *dfilter_error_msg;
#
# The first argument is the directory in which the source files live.
# The second argument is "dissectors", to indicate that we should build
-# a register.c file for libethereal.
+# a register.c file for libwireshark.
# All subsequent arguments are the files to scan.
#
register.c: $(plugin_src) $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
#
# The first argument is the directory in which the source files live.
# The second argument is "dissectors", to indicate that we should build
-# a register.c file for libethereal.
+# a register.c file for libwireshark.
# All subsequent arguments are the files to scan.
#
register.c: $(DISSECTOR_SRC)
generate_dissector: $(DISSECTOR_FILES)
-$(DISSECTOR_FILES): ../idl2eth budb.idl budb.cnf template.c template.h
- ../idl2eth budb
+$(DISSECTOR_FILES): ../idl2wrs budb.idl budb.cnf template.c template.h
+ ../idl2wrs budb
clean:
rm -f ETH_* $(DISSECTOR_FILES)
/* this idl is from the LGPL irelease of dce/dfs from the open group.
- it has been significantly modified to pass through idl2eth
+ it has been significantly modified to pass through idl2wrs
original copyright follows:
*/
/*
generate_dissector: $(DISSECTOR_FILES)
-$(DISSECTOR_FILES): ../idl2eth butc.idl butc.cnf template.c template.h
- ../idl2eth butc
+$(DISSECTOR_FILES): ../idl2wrs butc.idl butc.cnf template.c template.h
+ ../idl2wrs butc
clean:
rm -f ETH_* $(DISSECTOR_FILES)
/* This idl file originally came from the DCE project but has been
- significantly refactored to pass through the idl2eth idl-lite
+ significantly refactored to pass through the idl2wrs idl-lite
compiler.
DCE has been released as LGPL, hats off to TheOpenGroup
renamed error_status_t WERROR a 32bit integer ststus code
removed handle_t it has no wire encoding
- rewrote the unions so that idl2eth can parse them
+ rewrote the unions so that idl2wrs can parse them
changed all varying strings to the type butcNameString_t which is
implemented in the template
- changed the structs so they are compatible with idl2eth
+ changed the structs so they are compatible with idl2wrs
- afshyper is called udlong in idl2eth 8 bytes, aligned at 4 bytes
+ afshyper is called udlong in idl2wrs 8 bytes, aligned at 4 bytes
added afsnetaddr definition
generate_dissector: $(DISSECTOR_FILES)
-$(DISSECTOR_FILES): ../idl2eth drsuapi.idl drsuapi.cnf template.c template.h
- ../idl2eth drsuapi
+$(DISSECTOR_FILES): ../idl2wrs drsuapi.idl drsuapi.cnf template.c template.h
+ ../idl2wrs drsuapi
clean:
rm -f ETH_* $(DISSECTOR_FILES)
generate_dissector: $(DISSECTOR_FILES)
-$(DISSECTOR_FILES): ../idl2eth efs.idl efs.cnf template.c template.h
- ../idl2eth efs
+$(DISSECTOR_FILES): ../idl2wrs efs.idl efs.cnf template.c template.h
+ ../idl2wrs efs
clean:
rm -f ETH_* $(DISSECTOR_FILES)
/* incomplete */
);
-/*XXX this one is really void, need to fix idl2eth for this */
+/*XXX this one is really void, need to fix idl2wrs for this */
WERROR EfsRpcCloseRaw(
[in,out,ref] policy_handle *pvContext,
);
void usage(void)
{
- fprintf(stderr, "Usage: idl2eth <interface>\n");
+ fprintf(stderr, "Usage: idl2wrs <interface>\n");
}
void
*
* Altough some of these look redundant, I have separated them
* out for all CDR types, to assist in auto generation of
- * IDL dissectors later, see idl2eth -- FS
+ * IDL dissectors later, see idl2wrs -- FS
*
*/
/*
TODO:
- 1) Dissect encoded data (do sth like idl2eth for CORBA).
+ 1) Dissect encoded data (do sth like idl2wrs for CORBA).
2) Add conversations.
3) Register a dissector as one that can be selected by a UDP/TCP port number.
4) Put in Preferences/Protocols/ICEP Option menu:
* XXX - are these just DOS-format dates and times?
*
* Should we put code to understand various date and time formats (UNIX,
- * DOS, SMB weird mutant UNIX, NT, Mac, etc. into libethereal, and have
+ * DOS, SMB weird mutant UNIX, NT, Mac, etc. into libwireshark, and have
* the "display" member of an HF_ABSOLUTE_TIME field specify whether
* it's DOS date/DOS time, DOS time/DOS date, NT time, UNIX time_t,
* UNIX "struct timeval", NFSv3/NFSv4 seconds/nanoseconds, Mac, etc.?
/*
* XXX - this takes the plugin directory as an argument, because
- * libethereal now has its own configure script and "config.h" file,
+ * libwireshark now has its own configure script and "config.h" file,
* which is what code in the "epan" directory includes, but we need
* to define PLUGIN_DIR in the top-level directory, as it's used by,
* for example, the Makefile for the Gryphon plugin, so it knows
* where to install the plugin.
*
* Eventually, we should probably have an "epan-configure" script
- * (or "libethereal-configure", or whatever), along the lines of what
+ * (or "libwireshark-configure", or whatever), along the lines of what
* GTK+ and GLib have, that can print, among other things, the directory
- * into which plugins should be installed. That way, only libethereal
+ * into which plugins should be installed. That way, only libwireshark
* need know what directory that is; programs using it won't, *and*
* Makefiles for plugins can just use "epan-configure" to figure out
* where to install the plugins.
* Get the directory in which the global configuration and data files are
* stored.
*
- * XXX - if we ever make libethereal a real library, used by multiple
+ * XXX - if we ever make libwireshark a real library, used by multiple
* applications (more than just Twireshark and versions of Wireshark with
* various UIs), should the configuration files belong to the library
* (and be shared by all those applications) or to the applications?
* passed in as an argument, in some call, on UNIX.
*
* Note that some of those configuration files might be used by code in
- * libethereal, some of them might be used by dissectors (would they
- * belong to libethereal, the application, or a separate library?),
+ * libwireshark, some of them might be used by dissectors (would they
+ * belong to libwireshark, the application, or a separate library?),
* and some of them might be used by other code (the Wireshark preferences
* file includes resolver preferences that control the behavior of code
- * in libethereal, dissector preferences, and UI preferences, for
+ * in libwireshark, dissector preferences, and UI preferences, for
* example).
*/
const char *
SLAB_ITEM_TYPE_DEFINE(fvalue_t)
/* Free all memory used by an fvalue_t. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT SLAB_FREE_LIST_DECLARE(fvalue_t)
-; libethereal.def
+; libwireshark.def
; $Id$
EXPORTS
static void follow_stream_om_server(GtkWidget * w, gpointer data);
-/* With MSVC and a libethereal.dll, we need a special declaration. */
+/* With MSVC and a libwireshark.dll, we need a special declaration. */
ETH_VAR_IMPORT FILE *data_out_file;
#define E_FOLLOW_INFO_KEY "follow_info_key"
include ..\config.nmake
-ALL_RC=ethereal.rc libethereal.rc tethereal.rc capinfos.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc dumpcap.rc wireshark.exe.manifest
+ALL_RC=ethereal.rc libwireshark.rc tethereal.rc capinfos.rc editcap.rc text2pcap.rc mergecap.rc wiretap.rc dumpcap.rc wireshark.exe.manifest
all : $(ALL_RC)
wireshark.exe.manifest: ethereal.exe.manifest.in ..\config.nmake
-e s/@RC_VERSION@/$(RC_VERSION)/ \
< ethereal.rc.in > $@
-libethereal.rc: libethereal.rc.in ..\config.nmake
+libwireshark.rc: libwireshark.rc.in ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e s/@RC_VERSION@/$(RC_VERSION)/ \
- < libethereal.rc.in > $@
+ < libwireshark.rc.in > $@
tethereal.rc : tethereal.rc.in ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0"
VALUE "FileDescription", "Wireshark dissector library\0"
VALUE "FileVersion", "@VERSION@\0"
- VALUE "InternalName", "libethereal @VERSION@\0"
+ VALUE "InternalName", "libwireshark @VERSION@\0"
VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@wireshark.org>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
- VALUE "OriginalFilename", "libethereal.dll\0"
+ VALUE "OriginalFilename", "libwireshark.dll\0"
VALUE "ProductName", "Wireshark\0"
VALUE "ProductVersion", "@VERSION@\0"
END
!IF "$(MAKENSIS_MODERN_UI)" != ""
/DMAKENSIS_MODERN_UI=$(MAKENSIS_MODERN_UI) \
!ENDIF
-!IF "$(ENABLE_LIBETHEREAL)" != ""
- /DENABLE_LIBETHEREAL=$(ENABLE_LIBETHEREAL) \
+!IF "$(ENABLE_LIBWIRESHARK)" != ""
+ /DENABLE_LIBWIRESHARK=$(ENABLE_LIBWIRESHARK) \
!ENDIF
!IFDEF GTK1_DIR
/DGTK1_DIR=$(GTK1_DIR) \
SetOutPath $INSTDIR
File "..\..\wiretap\wiretap-${WTAP_VERSION}.dll"
-!ifdef ENABLE_LIBETHEREAL
-File "..\..\epan\libethereal.dll"
+!ifdef ENABLE_LIBWIRESHARK
+File "..\..\epan\libwireshark.dll"
!endif
File "${GLIB_DIR}\bin\libglib-2.0-0.dll"
File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll"
################################################################################
install-plugins:
-!IFDEF ENABLE_LIBETHEREAL
+!IFDEF ENABLE_LIBWIRESHARK
rm -rf $(VERSION)
mkdir $(VERSION)
xcopy acn\*.dll $(VERSION) /d
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
OBJECTS=packet-cosnaming.obj packet-coseventcomm.obj packet-tango.obj packet-parlay.obj
This directory contains Ethereal plugins that use the GIOP
API (see packet-giop.h).
-It is intended that the tool "idl2eth", now part of the standard
+It is intended that the tool "idl2wrs", now part of the standard
Ethereal distribution, will be used generate these plugins.
-Please read README.idl2eth for information on using "idl2eth"
+Please read README.idl2wrs for information on using "idl2wrs"
and README.plugins for incorporating CORBA GIOP plugins into
this directory (plugins/giop)
/* packet-coseventcomm.c
* Routines for IDL dissection
*
- * Autogenerated from idl2eth
+ * Autogenerated from idl2wrs
* Copyright 2001 Frank Singleton <frank.singleton@ericsson.com>
*/
/* packet-cosnaming.c
* Routines for IDL dissection
*
- * Autogenerated from idl2eth
+ * Autogenerated from idl2wrs
* Copyright 2001 Frank Singleton <frank.singleton@ericsson.com>
*/
/* packet-parlay.c
* Routines for IDL dissection
*
- * Autogenerated from idl2eth
+ * Autogenerated from idl2wrs
* Copyright 2001 Frank Singleton <frank.singleton@ericsson.com>
*/
/* packet-tango.c
* Routines for IDL dissection
*
- * Autogenerated from idl2eth
+ * Autogenerated from idl2wrs
* Copyright 2001 Frank Singleton <frank.singleton@ericsson.com>
*/
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
!IFDEF LUA_DIR
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
MODULES= \
elua_dumper.c \
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
OBJECTS=packet-mate.obj\
mate_setup.obj\
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
OBJECTS=stats_tree_plugin.obj pinfo_stats_tree.obj
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
OBJECTS=packet-mate.obj\
mate_setup.obj\
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
-!IFDEF ENABLE_LIBETHEREAL
-LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
-CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!IFDEF ENABLE_LIBWIRESHARK
+LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
+CFLAGS=/DHAVE_WIN32_LIBWIRESHARK_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
cvsdiff-fix.py \
dfilter-test.py \
fuzz-test.sh \
+ idl2wrs.sh \
lex.py \
make-dissector-reg \
make-dissector-reg.py \
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# We produce an archive library. In the future, when libethereal is a
-# shared library, this will be linked into libethereal. While libethereal
-# is an archive library, any executable linking against libethereal will
+# We produce an archive library. In the future, when libwireshark is a
+# shared library, this will be linked into libwireshark. While libwireshark
+# is an archive library, any executable linking against libwireshark will
# also need to link against libftypes.
noinst_PROGRAMS = lemon
#
# The second argument is either "plugin" or "dissectors"; if it's
# "plugin", we build a plugin.c for a plugin, and if it's
-# "dissectors", we build a register.c for libethereal.
+# "dissectors", we build a register.c for libwireshark.
#
registertype="$1"
shift
#
# The second argument is either "plugin" or "dissectors"; if it's
# "plugin", we build a plugin.c for a plugin, and if it's
-# "dissectors", we build a register.c for libethereal.
+# "dissectors", we build a register.c for libwireshark.
#
registertype = sys.argv[2]
if registertype == "plugin":
# Copyright tridge@samba.org 2000-2003
# Copyright tpot@samba.org 2001,2005
# Copyright jelmer@samba.org 2004-2005
-# Portions based on idl2eth.c by Ronnie Sahlberg
+# Portions based on idl2wrs.c by Ronnie Sahlberg
# released under the GNU GPL
=pod
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-# We produce an archive library. In the future, when libethereal is a
-# shared library, this will be linked into libethereal. While libethereal
-# is an archive library, any executable linking against libethereal will
+# We produce an archive library. In the future, when libwireshark is a
+# shared library, this will be linked into libwireshark. While libwireshark
+# is an archive library, any executable linking against libwireshark will
# also need to link against libftypes.
CLEANFILES = \
#
# $Id$
#
-# ethereal_gen.py (part of idl2eth)
+# ethereal_gen.py (part of idl2wrs)
#
# Author : Frank Singleton (frank.singleton@ericsson.com)
#
/* packet-@dissector_name@.c
* Routines for IDL dissection
*
- * Autogenerated from idl2eth
+ * Autogenerated from idl2wrs
* Copyright 2001 Frank Singleton <frank.singleton@@ericsson.com>
*/
git.samba.org / metze / wireshark / wip.git / commitdiff