diff options
-rw-r--r-- | acconfig.h | 6 | ||||
-rwxr-xr-x | autogen.sh | 4 | ||||
-rw-r--r-- | configure.in | 59 | ||||
-rw-r--r-- | epan/AUTHORS | 8 | ||||
-rw-r--r-- | epan/ChangeLog | 0 | ||||
-rw-r--r-- | epan/Makefile.am | 11 | ||||
-rw-r--r-- | epan/NEWS | 2 | ||||
-rw-r--r-- | epan/README | 3 | ||||
-rw-r--r-- | epan/acconfig.h | 32 | ||||
-rw-r--r-- | epan/configure.in | 119 | ||||
-rw-r--r-- | epan/epan.c | 32 | ||||
-rw-r--r-- | epan/epan.h | 4 | ||||
-rw-r--r-- | epan/plugins.c | 22 | ||||
-rw-r--r-- | epan/plugins.h | 17 | ||||
-rw-r--r-- | epan/resolv.c | 8 | ||||
-rw-r--r-- | epan/resolv.h | 12 | ||||
-rw-r--r-- | gtk/main.c | 4 | ||||
-rw-r--r-- | tethereal.c | 4 |
18 files changed, 240 insertions, 107 deletions
diff --git a/acconfig.h b/acconfig.h index d33adb88c3..cf05fef1ec 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,7 +1,7 @@ /* acconfig.h * #ifdefs to be controlled by "configure" * - * $Id: acconfig.h,v 1.16 2000/07/14 07:11:52 guy Exp $ + * $Id: acconfig.h,v 1.17 2000/10/16 23:18:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -31,10 +31,6 @@ #undef DATAFILE_DIR -#undef NEED_INET_ATON_H - -#undef NEED_INET_V6DEFS_H - #undef NEED_SNPRINTF_H #undef NEED_STRERROR_H diff --git a/autogen.sh b/autogen.sh index c8deebc0a5..7a5c179473 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,7 +2,7 @@ # # Run this to generate all the initial makefiles. # -# $Id: autogen.sh,v 1.11 2000/10/14 04:09:04 gram Exp $ +# $Id: autogen.sh,v 1.12 2000/10/16 23:18:03 guy Exp $ DIE=true PROJECT="Ethereal" @@ -77,7 +77,7 @@ if test -z "$*"; then fi aclocal_flags="`./aclocal-flags`" -for dir in . wiretap ; do +for dir in . epan wiretap ; do echo processing $dir ( cd $dir diff --git a/configure.in b/configure.in index 6db797125b..6d4cf999e0 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.103 2000/09/27 04:54:24 gram Exp $ +# $Id: configure.in,v 1.104 2000/10/16 23:18:03 guy Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -239,13 +239,13 @@ fi dnl Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h stdarg.h netdb.h dirent.h) +AC_CHECK_HEADERS(fcntl.h sys/ioctl.h sys/time.h unistd.h stdarg.h netdb.h) AC_CHECK_HEADERS(sys/stat.h sys/sockio.h sys/types.h sys/socket.h) -AC_CHECK_HEADERS(sys/wait.h sys/param.h) +AC_CHECK_HEADERS(sys/wait.h) AC_CHECK_HEADERS(netinet/in.h) AC_CHECK_HEADERS(stddef.h) AC_CHECK_HEADERS(dlfcn.h) -AC_CHECK_HEADERS(arpa/inet.h arpa/nameser.h) +AC_CHECK_HEADERS(arpa/inet.h) dnl SNMP Check AC_ARG_ENABLE(snmp, @@ -359,57 +359,6 @@ fi AC_SUBST(MKSTEMP_C) AC_SUBST(MKSTEMP_O) -AC_CHECK_FUNC(inet_aton, INET_ATON_O="", - INET_ATON_O="inet_aton.o") -if test "$ac_cv_func_inet_aton" = no ; then - INET_ATON_C="inet_aton.c" - INET_ATON_O="inet_aton.o" - AC_DEFINE(NEED_INET_ATON_H) -fi -AC_SUBST(INET_ATON_C) -AC_SUBST(INET_ATON_O) - -AC_CHECK_FUNC(inet_pton, [ - dnl check for pre-BIND82 inet_pton() bug. - AC_MSG_CHECKING(for broken inet_pton) - AC_TRY_RUN([#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -int main() -{ -#ifdef AF_INET6 - char buf[16]; - /* this should return 0 (error) */ - return inet_pton(AF_INET6, "0:1:2:3:4:5:6:7:", buf); -#else - return 1; -#endif -}], [AC_MSG_RESULT(ok); -have_inet_pton=yes], [AC_MSG_RESULT(broken); -have_inet_pton=no], [AC_MSG_RESULT(cross compiling, assume it is broken); -have_inet_pton=no])], -have_inet_pton=no) -if test "$have_inet_pton" = no; then - INET_PTON_C="inet_pton.c" - INET_PTON_O="inet_pton.o" -else - INET_PTON_C="" - INET_PTON_O="" -fi -AC_SUBST(INET_PTON_C) -AC_SUBST(INET_PTON_O) - -AC_CHECK_FUNC(inet_ntop, INET_NTOP_O="", - INET_NTOP_O="inet_ntop.o") -if test "$ac_cv_func_inet_ntop" = no ; then - INET_NTOP_C="inet_ntop.c" - INET_NTOP_O="inet_ntop.o" - AC_DEFINE(NEED_INET_V6DEFS_H) -fi -AC_SUBST(INET_NTOP_C) -AC_SUBST(INET_NTOP_O) - AC_CHECK_FUNCS(getprotobynumber gethostbyname2) dnl blank for now, but will be used in future diff --git a/epan/AUTHORS b/epan/AUTHORS new file mode 100644 index 0000000000..6fba39135e --- /dev/null +++ b/epan/AUTHORS @@ -0,0 +1,8 @@ +Authors +------- +Gilbert Ramirez <gram@xiexie.org> +Guy Harris <guy@alum.mit.edu> +Laurent Deniel <deniel@worldnet.fr> + +[XXX - throw into this list all the other Ethereal contributors whose +code got moved here] diff --git a/epan/ChangeLog b/epan/ChangeLog new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/epan/ChangeLog diff --git a/epan/Makefile.am b/epan/Makefile.am index fe5519064a..5d12aeeac1 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -2,7 +2,7 @@ # Automake file for the EPAN library # (Ethereal Protocol ANalyzer Library) # -# $Id: Makefile.am,v 1.9 2000/10/14 04:31:25 gram Exp $ +# $Id: Makefile.am,v 1.10 2000/10/16 23:17:39 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@zing.org> @@ -30,8 +30,11 @@ YFLAGS=-d -p dfilter_ # EPAN will eventually be a shared library. While I move source code around, # however, it is an archive library. +ACLOCAL_AMFLAGS = `../aclocal-flags` + noinst_LIBRARIES = libethereal.a +INCLUDES = -I$(srcdir)/.. libethereal_a_SOURCES = \ conversation.c \ @@ -82,6 +85,12 @@ CLEANFILES = \ libethereal.a \ *~ +# +# Add the object files for missing routines, if any. +# +libethereal_a_LIBADD = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ +libethereal_a_DEPENDENCIES = @INET_ATON_O@ @INET_PTON_O@ @INET_NTOP_O@ + dfilter-scanner.c : dfilter-scanner.l $(LEX) -Pdfilter_ -odfilter-scanner.c $(srcdir)/dfilter-scanner.l diff --git a/epan/NEWS b/epan/NEWS new file mode 100644 index 0000000000..8a405279c1 --- /dev/null +++ b/epan/NEWS @@ -0,0 +1,2 @@ +epan 0.0.0: +* Initial public release (in ethereal CVS tree) diff --git a/epan/README b/epan/README new file mode 100644 index 0000000000..99ed791b9e --- /dev/null +++ b/epan/README @@ -0,0 +1,3 @@ +$Id: README,v 1.1 2000/10/16 23:17:39 guy Exp $ + +XXX - put something here diff --git a/epan/acconfig.h b/epan/acconfig.h new file mode 100644 index 0000000000..86e1848b06 --- /dev/null +++ b/epan/acconfig.h @@ -0,0 +1,32 @@ +/* acconfig.h + * #ifdefs to be controlled by "configure" + * + * $Id: acconfig.h,v 1.1 2000/10/16 23:17:39 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@zing.org> + * Copyright 1998 Gerald Combs + * + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#undef HAVE_PLUGINS + +#undef DATAFILE_DIR + +#undef NEED_INET_ATON_H + +#undef NEED_INET_V6DEFS_H diff --git a/epan/configure.in b/epan/configure.in new file mode 100644 index 0000000000..1b0c9b65f7 --- /dev/null +++ b/epan/configure.in @@ -0,0 +1,119 @@ +# $Id: configure.in,v 1.1 2000/10/16 23:17:39 guy Exp $ +dnl +dnl Process this file with autoconf 2.13 or later to produce a +dnl configure script; 2.12 doesn't generate a "configure" script that +dnl defines SHELL, and "Makefile.in" has +dnl +dnl SHELL = @SHELL@ +dnl +dnl which requires it to be defined - and there may be other problems +dnl with pre-2.13 "autoconf" as well. +dnl +AC_INIT(epan.c) + +AC_PREREQ(2.13) + +AM_INIT_AUTOMAKE(libethereal.a, 0.0.0) +AM_CONFIG_HEADER(config.h) + +dnl Checks for programs. +AC_PROG_CC +AC_PROG_CPP +AC_PROG_YACC +AM_PROG_LEX +AC_PROG_RANLIB +AC_PATH_PROG(LEX, flex) + +AC_SUBST(FLEX_PATH) + +# If we're running gcc, add '-Wall' to CFLAGS. +AC_MSG_CHECKING(to see if we can add '-Wall' to CFLAGS) +if test x$GCC != x ; then + CFLAGS="-Wall $CFLAGS" + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi + +# Create DATAFILE_DIR #define for config.h +DATAFILE_DIR=$sysconfdir +DATAFILE_DIR=`( + test "x$prefix" = xNONE && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix=${prefix} + eval echo "$DATAFILE_DIR" +)` +AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$DATAFILE_DIR") +AC_SUBST(DATAFILE_DIR) + +# Checks for glib first, or gtk+ if not present +AM_PATH_GLIB(1.1.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS") + +dnl Checks for header files +AC_HEADER_STDC +AC_CHECK_HEADERS(stdarg.h direct.h dirent.h fcntl.h netdb.h unistd.h) +AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/stat.h sys/time.h sys/types.h) +AC_CHECK_HEADERS(netinet/in.h) +AC_CHECK_HEADERS(arpa/inet.h arpa/nameser.h) +AC_CHECK_HEADERS(dlfcn.h) + +# +# XXX - we should also somehow arrange to support dynamic linking on +# HP-UX, even though it hasn't yet, apparently, implemented the +# UNIX standard "dlopen()" interface atop its own interface. +# +if test "$ac_cv_header_dlfcn_h" = yes ; then + AC_DEFINE(HAVE_PLUGINS) +fi + +AC_CHECK_FUNC(inet_aton, INET_ATON_O="", + INET_ATON_O="inet_aton.o") +if test "$ac_cv_func_inet_aton" = no ; then + INET_ATON_C="inet_aton.c" + INET_ATON_O="inet_aton.o" + AC_DEFINE(NEED_INET_ATON_H) +fi +AC_SUBST(INET_ATON_C) +AC_SUBST(INET_ATON_O) + +AC_CHECK_FUNC(inet_pton, [ + dnl check for pre-BIND82 inet_pton() bug. + AC_MSG_CHECKING(for broken inet_pton) + AC_TRY_RUN([#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> +int main() +{ +#ifdef AF_INET6 + char buf[16]; + /* this should return 0 (error) */ + return inet_pton(AF_INET6, "0:1:2:3:4:5:6:7:", buf); +#else + return 1; +#endif +}], [AC_MSG_RESULT(ok); +have_inet_pton=yes], [AC_MSG_RESULT(broken); +have_inet_pton=no], [AC_MSG_RESULT(cross compiling, assume it is broken); +have_inet_pton=no])], +have_inet_pton=no) +if test "$have_inet_pton" = no; then + INET_PTON_C="inet_pton.c" + INET_PTON_O="inet_pton.o" +else + INET_PTON_C="" + INET_PTON_O="" +fi +AC_SUBST(INET_PTON_C) +AC_SUBST(INET_PTON_O) + +AC_CHECK_FUNC(inet_ntop, INET_NTOP_O="", + INET_NTOP_O="inet_ntop.o") +if test "$ac_cv_func_inet_ntop" = no ; then + INET_NTOP_C="inet_ntop.c" + INET_NTOP_O="inet_ntop.o" + AC_DEFINE(NEED_INET_V6DEFS_H) +fi +AC_SUBST(INET_NTOP_C) +AC_SUBST(INET_NTOP_O) + +AC_OUTPUT(Makefile) diff --git a/epan/epan.c b/epan/epan.c index 2dd19ac811..98b87d9cc2 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -1,3 +1,10 @@ +/* epan.h + * + * $Id: epan.c,v 1.4 2000/10/16 23:17:39 guy Exp $ + * + * Ethereal Protocol Analyzer Library + * + */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -14,8 +21,29 @@ #include "proto.h" #include "tvbuff.h" +/* + * XXX - this takes the plugin directory as an argument, because + * libethereal 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 + * GTK+ and GLib have, that can print, among other things, the directory + * into which plugins should be installed. That way, only libethereal + * 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. + * + * (Would that *more* libraries had configure scripts like that, so + * that configure scripts didn't have to go through various contortions + * to figure out where the header files and libraries for various + * libraries are located.) + */ void -epan_init(void) +epan_init(const char *plugin_dir) { except_init(); tvbuff_init(); @@ -23,7 +51,7 @@ epan_init(void) proto_init(); dfilter_init(); #ifdef HAVE_PLUGINS - init_plugins(); + init_plugins(plugin_dir); #endif } diff --git a/epan/epan.h b/epan/epan.h index f38067d284..3c6a921206 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -1,5 +1,7 @@ /* epan.h * + * $Id: epan.h,v 1.4 2000/10/16 23:17:39 guy Exp $ + * * Ethereal Protocol Analyzer Library * */ @@ -12,7 +14,7 @@ /* XXX - for now */ #include "packet.h" -void epan_init(void); +void epan_init(const char *); void epan_cleanup(void); void epan_conversation_init(void); diff --git a/epan/plugins.c b/epan/plugins.c index fa50b9faf5..ffee7452d8 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -1,7 +1,7 @@ /* plugins.c * plugin routines * - * $Id: plugins.c,v 1.2 2000/09/28 03:16:16 gram Exp $ + * $Id: plugins.c,v 1.3 2000/10/16 23:17:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -266,7 +266,7 @@ plugin_replace_filter(const gchar *name, const gchar *version, */ int -save_plugin_status() +save_plugin_status(void) { gchar *pf_path; FILE *statusfile; @@ -467,7 +467,7 @@ plugins_scan_dir(const char *dirname) * init plugins */ void -init_plugins() +init_plugins(const char *plugin_dir) { struct stat std_dir_stat, local_dir_stat, plugin_dir_stat; @@ -539,12 +539,12 @@ init_plugins() plugins_scan_dir(std_plug_dir); plugins_scan_dir(local_plug_dir); - if ((strcmp(std_plug_dir, PLUGIN_DIR) != 0) && - (strcmp(local_plug_dir, PLUGIN_DIR) != 0)) + if ((strcmp(std_plug_dir, plugin_dir) != 0) && + (strcmp(local_plug_dir, plugin_dir) != 0)) { - if (stat(PLUGIN_DIR, &plugin_dir_stat) == 0) + if (stat(plugin_dir, &plugin_dir_stat) == 0) { - /* check if PLUGIN_DIR is really different from std_dir and + /* check if plugin_dir is really different from std_dir and * local_dir if they exist ! */ if (stat(std_plug_dir, &std_dir_stat) == 0) { @@ -554,22 +554,22 @@ init_plugins() plugin_dir_stat.st_ino != std_dir_stat.st_ino) && (plugin_dir_stat.st_dev != local_dir_stat.st_dev || plugin_dir_stat.st_ino != local_dir_stat.st_ino)) - plugins_scan_dir(PLUGIN_DIR); + plugins_scan_dir(plugin_dir); } else { if ((plugin_dir_stat.st_dev != std_dir_stat.st_dev || plugin_dir_stat.st_ino != std_dir_stat.st_ino)) - plugins_scan_dir(PLUGIN_DIR); + plugins_scan_dir(plugin_dir); } } else if (stat(local_plug_dir, &local_dir_stat) == 0) { if ((plugin_dir_stat.st_dev != local_dir_stat.st_dev || plugin_dir_stat.st_ino != local_dir_stat.st_ino)) - plugins_scan_dir(PLUGIN_DIR); + plugins_scan_dir(plugin_dir); } - else plugins_scan_dir(PLUGIN_DIR); + else plugins_scan_dir(plugin_dir); } } if (!user_plug_dir) diff --git a/epan/plugins.h b/epan/plugins.h index f66674aaeb..9cdec6e313 100644 --- a/epan/plugins.h +++ b/epan/plugins.h @@ -1,7 +1,7 @@ /* plugins.h * definitions for plugins structures * - * $Id: plugins.h,v 1.1 2000/09/27 04:54:51 gram Exp $ + * $Id: plugins.h,v 1.2 2000/10/16 23:17:40 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -29,20 +29,9 @@ #include <glib.h> #include <gmodule.h> -#ifdef HAVE_CONFIG_H -#include "config.h" -#ifdef HAVE_DLFCN_H -#define HAVE_PLUGINS 1 -#endif -#endif /* HAVE_CONFIG_H */ - #include "dfilter.h" #include "packet.h" -#ifdef HAVE_WINSOCK_H -#include <winsock.h> -#endif - typedef struct _plugin { GModule *handle; /* handle returned by dlopen */ gchar *name; /* plugin name */ @@ -68,7 +57,7 @@ void *disable_plugin(const gchar *, const gchar *); void *find_plugin(const gchar *, const gchar *); gboolean is_enabled(const gchar *, const gchar *); void plugin_replace_filter(const gchar *, const gchar *, const gchar *, dfilter *); -int save_plugin_status(); -void init_plugins(); +int save_plugin_status(void); +void init_plugins(const char *); #endif /* __PLUGINS_H__ */ diff --git a/epan/resolv.c b/epan/resolv.c index 99ee58eb56..072b372bd7 100644 --- a/epan/resolv.c +++ b/epan/resolv.c @@ -1,7 +1,7 @@ /* resolv.c * Routines for network object lookup * - * $Id: resolv.c,v 1.1 2000/09/28 03:28:53 gram Exp $ + * $Id: resolv.c,v 1.2 2000/10/16 23:17:40 guy Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -84,6 +84,12 @@ #include "resolv.h" #include "util.h" +#define EPATH_ETHERS "/etc/ethers" +#define EPATH_IPXNETS "/etc/ipxnets" +#define EPATH_MANUF DATAFILE_DIR "/manuf" +#define EPATH_PERSONAL_ETHERS ".ethereal/ethers" /* with "$HOME/" prefix */ +#define EPATH_PERSONAL_IPXNETS ".ethereal/ipxnets" /* with "$HOME/" prefix */ + #define MAXMANUFLEN 9 /* max vendor name length with ending '\0' */ #define HASHETHSIZE 1024 #define HASHHOSTSIZE 1024 diff --git a/epan/resolv.h b/epan/resolv.h index 1af7c49b8e..d292b50151 100644 --- a/epan/resolv.h +++ b/epan/resolv.h @@ -1,7 +1,7 @@ /* resolv.h * Definitions for network object lookup * - * $Id: resolv.h,v 1.1 2000/09/28 03:28:54 gram Exp $ + * $Id: resolv.h,v 1.2 2000/10/16 23:17:40 guy Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -28,16 +28,6 @@ #ifndef __RESOLV_H__ #define __RESOLV_H__ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#define EPATH_ETHERS "/etc/ethers" -#define EPATH_IPXNETS "/etc/ipxnets" -#define EPATH_MANUF DATAFILE_DIR "/manuf" -#define EPATH_PERSONAL_ETHERS ".ethereal/ethers" /* with "$HOME/" prefix */ -#define EPATH_PERSONAL_IPXNETS ".ethereal/ipxnets" /* with "$HOME/" prefix */ - #ifndef MAXNAMELEN #define MAXNAMELEN 64 /* max name length (hostname and port name) */ #endif diff --git a/gtk/main.c b/gtk/main.c index e62ad75602..98b8596ae7 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.159 2000/09/27 04:55:05 gram Exp $ + * $Id: main.c,v 1.160 2000/10/16 23:18:05 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -856,7 +856,7 @@ main(int argc, char *argv[]) "-G" flag, as the "-G" flag dumps a list of fields registered by the dissectors, and we must do it before we read the preferences, in case any dissectors register preferences. */ - epan_init(); + epan_init(PLUGIN_DIR); /* Now register the preferences for any non-dissector modules. We must do that before we read the preferences as well. */ diff --git a/tethereal.c b/tethereal.c index 61dec0110d..df287777c6 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.50 2000/10/08 17:16:29 gerald Exp $ + * $Id: tethereal.c,v 1.51 2000/10/16 23:18:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -190,7 +190,7 @@ main(int argc, char *argv[]) "-G" flag, as the "-G" flag dumps a list of fields registered by the dissectors, and we must do it before we read the preferences, in case any dissectors register preferences. */ - epan_init(); + epan_init(PLUGIN_DIR); /* Now register the preferences for any non-dissector modules. We must do that before we read the preferences as well. */ |