diff options
| -rw-r--r-- | dftest.c | 6 | ||||
| -rw-r--r-- | epan/epan.c | 7 | ||||
| -rw-r--r-- | epan/epan.h | 5 | ||||
| -rw-r--r-- | epan/proto.c | 6 | ||||
| -rw-r--r-- | epan/proto.h | 5 | ||||
| -rw-r--r-- | gtk/main.c | 5 | ||||
| -rw-r--r-- | tethereal.c | 5 |
7 files changed, 23 insertions, 16 deletions
@@ -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. */ diff --git a/epan/epan.c b/epan/epan.c index a779cb876b..407f6aa11b 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -1,6 +1,6 @@ /* epan.h * - * $Id: epan.c,v 1.9 2001/04/01 22:01:34 hagbard Exp $ + * $Id: epan.c,v 1.10 2001/04/02 00:38:34 hagbard Exp $ * * Ethereal Protocol Analyzer Library * @@ -42,12 +42,13 @@ * libraries are located.) */ void -epan_init(const char *plugin_dir) +epan_init(const char *plugin_dir, void (register_all_protocols)(void), + void (register_all_handoffs)(void)) { except_init(); tvbuff_init(); frame_data_init(); - proto_init(plugin_dir); + proto_init(plugin_dir,register_all_protocols,register_all_handoffs); packet_init(); dfilter_init(); } diff --git a/epan/epan.h b/epan/epan.h index 9f94865f2e..a2d97585f8 100644 --- a/epan/epan.h +++ b/epan/epan.h @@ -1,6 +1,6 @@ /* epan.h * - * $Id: epan.h,v 1.5 2001/02/01 20:21:16 gram Exp $ + * $Id: epan.h,v 1.6 2001/04/02 00:38:34 hagbard Exp $ * * Ethereal Protocol Analyzer Library * @@ -14,7 +14,8 @@ /* XXX - for now */ #include "packet.h" -void epan_init(const char *); +void epan_init(const char * plugindir, void (register_all_protocols)(void), + void (register_all_handoffs)(void)); void epan_cleanup(void); void epan_conversation_init(void); diff --git a/epan/proto.c b/epan/proto.c index c2f23f2b2d..e1e33677d8 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -1,7 +1,7 @@ /* proto.c * Routines for protocol tree * - * $Id: proto.c,v 1.18 2001/04/01 22:50:08 hagbard Exp $ + * $Id: proto.c,v 1.19 2001/04/02 00:38:34 hagbard Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -42,7 +42,6 @@ #include "packet.h" #include "strutil.h" #include "resolv.h" -#include "register.h" #include "plugins.h" #include "ipv6-utils.h" #include "proto.h" @@ -164,7 +163,8 @@ gboolean proto_tree_is_visible = FALSE; /* initialize data structures and register protocols and fields */ void -proto_init(const char *plugin_dir) +proto_init(const char *plugin_dir,void (register_all_protocols)(void), + void (register_all_protocol_handoffs)(void)) { static hf_register_info hf[] = { { &hf_text_only, diff --git a/epan/proto.h b/epan/proto.h index 42fdd52fc0..5bf1b2c5d9 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -1,7 +1,7 @@ /* proto.h * Definitions for protocol display * - * $Id: proto.h,v 1.10 2001/04/01 22:50:08 hagbard Exp $ + * $Id: proto.h,v 1.11 2001/04/02 00:38:34 hagbard Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -129,7 +129,8 @@ typedef struct field_info { #define NullTVB NULL /* Sets up memory used by proto routines. Called at program startup */ -void proto_init(const char *plugin_dir); +void proto_init(const char *plugin_dir, void (register_all_protocols)(void), + void (register_all_handoffs)(void)); /* Frees memory used by proto routines. Called at program shutdown */ void proto_cleanup(void); diff --git a/gtk/main.c b/gtk/main.c index c49ef82dfa..8b1c6841fe 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.185 2001/03/27 06:48:12 guy Exp $ + * $Id: main.c,v 1.186 2001/04/02 00:38:36 hagbard Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -134,6 +134,7 @@ #include "plugins.h" #include "colors.h" #include "strutil.h" +#include "register.h" packet_info pi; capture_file cfile; @@ -804,7 +805,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(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. */ diff --git a/tethereal.c b/tethereal.c index 086f097cf7..915255b139 100644 --- a/tethereal.c +++ b/tethereal.c @@ -1,6 +1,6 @@ /* tethereal.c * - * $Id: tethereal.c,v 1.72 2001/03/27 06:48:11 guy Exp $ + * $Id: tethereal.c,v 1.73 2001/04/02 00:38:33 hagbard Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -93,6 +93,7 @@ #include "util.h" #include "conversation.h" #include "plugins.h" +#include "register.h" static guint32 firstsec, firstusec; static guint32 prevsec, prevusec; @@ -201,7 +202,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(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. */ |