summaryrefslogtreecommitdiff
path: root/dftest.c
diff options
context:
space:
mode:
authorEd Warnicke <hagbard@physics.rutgers.edu>2001-04-02 00:38:36 +0000
committerEd Warnicke <hagbard@physics.rutgers.edu>2001-04-02 00:38:36 +0000
commitf5cf9c8dcaebd81935264cbcc55bb6de1fa98ba2 (patch)
tree9b6ab3270962ed53d41dbf9d7978bf6bff9705b7 /dftest.c
parent58a096e88c8b5904d1059c7f3a588947d8ae7e07 (diff)
downloadwireshark-f5cf9c8dcaebd81935264cbcc55bb6de1fa98ba2.tar.gz
Added two new arguments to epan_init() and proto_init() to
allow the passing of register_all_protocols() and register_all_protocol_handoffs() through epan_init() to proto_init(). This allows the removal of the compile time dependence of proto.c on register.h. Modified dftest.c, tethereal.c, and gtk/main.c to use the new style epan_init() and depend on register.h. svn path=/trunk/; revision=3237
Diffstat (limited to 'dftest.c')
-rw-r--r--dftest.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/dftest.c b/dftest.c
index 95d85f59ef..7556d77360 100644
--- a/dftest.c
+++ b/dftest.c
@@ -1,6 +1,6 @@
/* dftest.c.c
*
- * $Id: dftest.c,v 1.1 2001/02/01 20:21:13 gram Exp $
+ * $Id: dftest.c,v 1.2 2001/04/02 00:38:33 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -81,6 +81,7 @@
#include "prefs.h"
#include "util.h"
#include "epan/dfilter/dfilter.h"
+#include "register.h"
packet_info pi;
ts_type timestamp_type = RELATIVE;
@@ -98,7 +99,8 @@ 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(PLUGIN_DIR);
+ epan_init(PLUGIN_DIR,register_all_protocols,
+ register_all_protocol_handoffs);
/* now register the preferences for any non-dissector modules.
we must do that before we read the preferences as well. */