diff options
| -rw-r--r-- | epan/plugins.c | 9 | ||||
| -rw-r--r-- | plugins/plugin_api.c | 9 | ||||
| -rw-r--r-- | plugins/plugin_api.h | 9 | ||||
| -rw-r--r-- | plugins/plugin_api_defs.h | 9 | ||||
| -rw-r--r-- | plugins/plugin_table.h | 17 |
5 files changed, 35 insertions, 18 deletions
diff --git a/epan/plugins.c b/epan/plugins.c index 507e0acf8c..f2ee2d3f34 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -1,7 +1,7 @@ /* plugins.c * plugin routines * - * $Id: plugins.c,v 1.47 2002/02/02 03:42:17 guy Exp $ + * $Id: plugins.c,v 1.48 2002/02/20 08:24:51 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -295,11 +295,14 @@ init_plugins(const char *plugin_dir) patable.p_register_init_routine = register_init_routine; patable.p_register_postseq_cleanup_routine = register_postseq_cleanup_routine; - patable.p_conversation_new = conversation_new; - patable.p_find_conversation = find_conversation; + patable.p_match_strval = match_strval; patable.p_val_to_str = val_to_str; + patable.p_conversation_new = conversation_new; + patable.p_find_conversation = find_conversation; + patable.p_conversation_set_dissector = conversation_set_dissector; + patable.p_proto_register_protocol = proto_register_protocol; patable.p_proto_register_field_array = proto_register_field_array; patable.p_proto_register_subtree_array = proto_register_subtree_array; diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c index 7fd2cebb48..95d6a945b6 100644 --- 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.35 2002/02/02 03:42:18 guy Exp $ + * $Id: plugin_api.c,v 1.36 2002/02/20 08:24:52 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -43,11 +43,12 @@ 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_register_postseq_cleanup_routine = pat->p_register_postseq_cleanup_routine; - p_conversation_new = pat->p_conversation_new; - p_find_conversation = pat->p_find_conversation; + p_register_postseq_cleanup_routine = pat->p_register_postseq_cleanup_routine; p_match_strval = pat->p_match_strval; p_val_to_str = pat->p_val_to_str; + p_conversation_new = pat->p_conversation_new; + p_find_conversation = pat->p_find_conversation; + p_conversation_set_dissector = pat->p_conversation_set_dissector; p_proto_register_protocol = pat->p_proto_register_protocol; p_proto_register_field_array = pat->p_proto_register_field_array; p_proto_register_subtree_array = pat->p_proto_register_subtree_array; diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h index 9f5ce16a96..17ab3ccfdf 100644 --- 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.36 2002/02/02 03:42:18 guy Exp $ + * $Id: plugin_api.h,v 1.37 2002/02/20 08:24:52 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -48,11 +48,14 @@ #define register_init_routine (*p_register_init_routine) #define register_postseq_cleanup_routine (*p_register_postseq_cleanup_routine) -#define conversation_new (*p_conversation_new) -#define find_conversation (*p_find_conversation) + #define match_strval (*p_match_strval) #define val_to_str (*p_val_to_str) +#define conversation_new (*p_conversation_new) +#define find_conversation (*p_find_conversation) +#define conversation_set_dissector (*p_conversation_set_dissector) + #define proto_register_protocol (*p_proto_register_protocol) #define proto_register_field_array (*p_proto_register_field_array) #define proto_register_subtree_array (*p_proto_register_subtree_array) diff --git a/plugins/plugin_api_defs.h b/plugins/plugin_api_defs.h index bccaca4763..3847af90c2 100644 --- 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.11 2002/02/02 03:42:18 guy Exp $ + * $Id: plugin_api_defs.h,v 1.12 2002/02/20 08:24:52 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -37,11 +37,14 @@ addr_col_set_str p_col_set_str; addr_register_init_routine p_register_init_routine; addr_register_postseq_cleanup_routine p_register_postseq_cleanup_routine; -addr_conversation_new p_conversation_new; -addr_find_conversation p_find_conversation; + addr_match_strval p_match_strval; addr_val_to_str p_val_to_str; +addr_conversation_new p_conversation_new; +addr_find_conversation p_find_conversation; +addr_conversation_set_dissector p_conversation_set_dissector; + addr_proto_register_protocol p_proto_register_protocol; addr_proto_register_field_array p_proto_register_field_array; addr_proto_register_subtree_array p_proto_register_subtree_array; diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h index 609bdc31a2..6c5715fbf2 100644 --- 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.39 2002/02/19 01:28:43 guy Exp $ + * $Id: plugin_table.h,v 1.40 2002/02/20 08:24:52 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -42,12 +42,16 @@ typedef void (*addr_col_set_str)(column_info*, gint, gchar*); typedef void (*addr_register_init_routine)(void (*func)(void)); typedef void (*addr_register_postseq_cleanup_routine)(void (*func)(void)); + +typedef gchar* (*addr_match_strval)(guint32, const value_string*); +typedef gchar* (*addr_val_to_str)(guint32, const value_string *, const char *); + typedef conversation_t *(*addr_conversation_new)(address *, address *, port_type, guint32, guint32, guint); typedef conversation_t *(*addr_find_conversation)(address *, address *, port_type, guint32, guint32, guint); -typedef gchar* (*addr_match_strval)(guint32, const value_string*); -typedef gchar* (*addr_val_to_str)(guint32, const value_string *, const char *); +typedef void (*addr_conversation_set_dissector)(conversation_t *, + dissector_handle_t); typedef int (*addr_proto_register_protocol)(char*, char*, char*); typedef void (*addr_proto_register_field_array)(int, hf_register_info*, int); @@ -230,11 +234,14 @@ typedef struct { addr_register_init_routine p_register_init_routine; addr_register_postseq_cleanup_routine p_register_postseq_cleanup_routine; - addr_conversation_new p_conversation_new; - addr_find_conversation p_find_conversation; + addr_match_strval p_match_strval; addr_val_to_str p_val_to_str; + addr_conversation_new p_conversation_new; + addr_find_conversation p_find_conversation; + addr_conversation_set_dissector p_conversation_set_dissector; + addr_proto_register_protocol p_proto_register_protocol; addr_proto_register_field_array p_proto_register_field_array; addr_proto_register_subtree_array p_proto_register_subtree_array; |