Remove the no-longer-extant "conv_dissector_add()" from the list of

plugin APIs, and add the new "dissector_add_handle()".

Add an entry in the dissector table structure for
"create_dissector_handle".

svn path=/trunk/; revision=4314

diff --git a/epan/plugins.c b/epan/plugins.c
index 3ba4313d0659f5c56e93936aa20eec781d517367..1e3730dd01d3a48ca4dece01d20cf568c3145803 100644 (file)
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -1,7 +1,7 @@
 /* plugins.c
  * plugin routines
  *
- * $Id: plugins.c,v 1.43 2001/12/03 04:00:14 guy Exp $
+ * $Id: plugins.c,v 1.44 2001/12/03 10:00:21 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -293,7 +293,6 @@ init_plugins(const char *plugin_dir)
        patable.p_col_set_str                   = col_set_str;
 
        patable.p_register_init_routine         = register_init_routine;
-       patable.p_conv_dissector_add            = conv_dissector_add;
        patable.p_conversation_new              = conversation_new;
        patable.p_find_conversation             = find_conversation;
        patable.p_match_strval                  = match_strval;
@@ -305,6 +304,7 @@ init_plugins(const char *plugin_dir)
 
        patable.p_dissector_add                 = dissector_add;
        patable.p_dissector_delete              = dissector_delete;
+       patable.p_dissector_add_handle          = dissector_add_handle;
 
        patable.p_heur_dissector_add            = heur_dissector_add;
 

diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c
index 368585370db6d2e58fa43f21916b7e8521892bef..c6525a2a0c6ff6dbb0027c511993574d997c5bec 100644 (file)
--- a/plugins/plugin_api.c
+++ b/plugins/plugin_api.c
@@ -1,7 +1,7 @@
 /* plugin_api.c
  * Routines for Ethereal plugins.
  *
- * $Id: plugin_api.c,v 1.31 2001/12/03 04:00:22 guy Exp $
+ * $Id: plugin_api.c,v 1.32 2001/12/03 10:00:22 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -42,7 +42,6 @@ plugin_address_table_init(plugin_address_table_t *pat)
        p_col_append_str                        = pat->p_col_append_str;
        p_col_set_str                           = pat->p_col_set_str;
        p_register_init_routine                 = pat->p_register_init_routine;
-       p_conv_dissector_add                    = pat->p_conv_dissector_add;
        p_conversation_new                      = pat->p_conversation_new;
        p_find_conversation                     = pat->p_find_conversation;
        p_match_strval                          = pat->p_match_strval;
@@ -52,6 +51,7 @@ plugin_address_table_init(plugin_address_table_t *pat)
        p_proto_register_subtree_array          = pat->p_proto_register_subtree_array;
        p_dissector_add                         = pat->p_dissector_add;
        p_dissector_delete                      = pat->p_dissector_delete;
+       p_dissector_add_handle                  = pat->p_dissector_add_handle;
        p_heur_dissector_add                    = pat->p_heur_dissector_add;
        p_register_dissector                    = pat->p_register_dissector;
        p_find_dissector                        = pat->p_find_dissector;

diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h
index 37cbda200b691572b2bd18780a9663ba85e73b28..60d0b261617c9ad9cba41474e41a919cb8308ab7 100644 (file)
--- a/plugins/plugin_api.h
+++ b/plugins/plugin_api.h
@@ -1,7 +1,7 @@
 /* plugin_api.h
  * Routines for Ethereal plugins.
  *
- * $Id: plugin_api.h,v 1.31 2001/12/03 04:00:22 guy Exp $
+ * $Id: plugin_api.h,v 1.32 2001/12/03 10:00:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -43,7 +43,6 @@
 #define        col_set_str                     (*p_col_set_str)
 
 #define register_init_routine          (*p_register_init_routine)
-#define conv_dissector_add             (*p_conv_dissector_add)
 #define conversation_new               (*p_conversation_new)
 #define find_conversation              (*p_find_conversation)
 #define match_strval                   (*p_match_strval)
@@ -55,6 +54,7 @@
 
 #define        dissector_add                   (*p_dissector_add)
 #define dissector_delete               (*p_dissector_delete)
+#define        dissector_add_handle            (*p_dissector_add_handle)
 
 #define        heur_dissector_add              (*p_heur_dissector_add)
 

diff --git a/plugins/plugin_api_defs.h b/plugins/plugin_api_defs.h
index 02facb81852255aa6ba9fa8be50869069b7c5fbf..af1f5a8485d0acde975a3b257415d5393fe6030b 100644 (file)
--- a/plugins/plugin_api_defs.h
+++ b/plugins/plugin_api_defs.h
@@ -1,7 +1,7 @@
 /* plugin_api_defs.h
  * Define the variables that hold pointers to plugin API functions
  *
- * $Id: plugin_api_defs.h,v 1.7 2001/12/03 04:00:22 guy Exp $
+ * $Id: plugin_api_defs.h,v 1.8 2001/12/03 10:00:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -32,7 +32,6 @@ addr_col_append_str                   p_col_append_str;
 addr_col_set_str                       p_col_set_str;
 
 addr_register_init_routine             p_register_init_routine;
-addr_conv_dissector_add                        p_conv_dissector_add;
 addr_conversation_new                  p_conversation_new;
 addr_find_conversation                 p_find_conversation;
 addr_match_strval                      p_match_strval;
@@ -44,6 +43,7 @@ addr_proto_register_subtree_array     p_proto_register_subtree_array;
 
 addr_dissector_add                     p_dissector_add;
 addr_dissector_delete                  p_dissector_delete;
+addr_dissector_add_handle              p_dissector_add_handle;
 
 addr_heur_dissector_add                        p_heur_dissector_add;
 

diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h
index 758b65385ad5799dd17590d71a75f6f15446646f..ab4a4916fed77c1e2c7a27863aa70f9ca7fd256f 100644 (file)
--- a/plugins/plugin_table.h
+++ b/plugins/plugin_table.h
@@ -1,7 +1,7 @@
 /* plugin_table.h
  * Table of exported addresses for Ethereal plugins.
  *
- * $Id: plugin_table.h,v 1.33 2001/12/03 04:00:22 guy Exp $
+ * $Id: plugin_table.h,v 1.34 2001/12/03 10:00:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -37,7 +37,6 @@ typedef void (*addr_col_append_str)(frame_data*, gint, gchar*);
 typedef void (*addr_col_set_str)(frame_data*, gint, gchar*);
 
 typedef void (*addr_register_init_routine)(void (*func)(void));
-typedef void (*addr_conv_dissector_add)(const char *, dissector_handle_t);
 typedef conversation_t *(*addr_conversation_new)(address *, address *, 
     port_type, guint32, guint32, guint);
 typedef conversation_t *(*addr_find_conversation)(address *, address *, 
@@ -52,6 +51,8 @@ typedef void (*addr_proto_register_subtree_array)(int**, int);
 typedef void (*addr_dissector_add)(const char *, guint32, dissector_handle_t);
 typedef void (*addr_dissector_delete)(const char *, guint32,
     dissector_handle_t);
+typedef void (*addr_dissector_add_handle)(const char *,
+    dissector_handle_t);
 
 typedef void (*addr_heur_dissector_add)(const char *, heur_dissector_t, int);
 
@@ -218,7 +219,6 @@ typedef struct  {
        addr_col_set_str                        p_col_set_str;
 
        addr_register_init_routine              p_register_init_routine;
-       addr_conv_dissector_add                 p_conv_dissector_add;
        addr_conversation_new                   p_conversation_new;
        addr_find_conversation                  p_find_conversation;
        addr_match_strval                       p_match_strval;
@@ -230,11 +230,13 @@ typedef struct  {
 
        addr_dissector_add                      p_dissector_add;
        addr_dissector_delete                   p_dissector_delete;
+       addr_dissector_add_handle               p_dissector_add_handle;
 
        addr_heur_dissector_add                 p_heur_dissector_add;
 
        addr_register_dissector                 p_register_dissector;
        addr_find_dissector                     p_find_dissector;
+       addr_create_dissector_handle            p_create_dissector_handle;
        addr_call_dissector                     p_call_dissector;
 
        addr_dissect_data                       p_dissect_data;