diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mgcp/packet-mgcp.c | 16 | ||||
| -rw-r--r-- | plugins/plugin_api.c | 4 | ||||
| -rw-r--r-- | plugins/plugin_api.h | 4 | ||||
| -rw-r--r-- | plugins/plugin_table.h | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c index 76811fffd1..f94fe51f2c 100644 --- a/plugins/mgcp/packet-mgcp.c +++ b/plugins/mgcp/packet-mgcp.c @@ -2,7 +2,7 @@ * Routines for mgcp packet disassembly * RFC 2705 * - * $Id: packet-mgcp.c,v 1.12 2001/01/03 06:56:03 guy Exp $ + * $Id: packet-mgcp.c,v 1.13 2001/01/03 07:53:48 guy Exp $ * * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu> * @@ -430,9 +430,15 @@ proto_register_mgcp(void) }; module_t *mgcp_module; + proto_mgcp = proto_register_protocol("Media Gateway Control Protocol", + "MGCP", "mgcp"); + + proto_register_field_array(proto_mgcp, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + /* Register our configuration options for , particularly our ports */ - mgcp_module = prefs_register_module("mgcp", "MGCP", proto_reg_handoff_mgcp); + mgcp_module = prefs_register_protocol(proto_mgcp, proto_reg_handoff_mgcp); prefs_register_uint_preference(mgcp_module, "tcp.gateway_port", "MGCP Gateway TCP Port", @@ -475,12 +481,6 @@ proto_register_mgcp(void) "raw text", &global_mgcp_dissect_tree); - proto_mgcp = proto_register_protocol("Media Gateway Control Protocol", - "MGCP", "mgcp"); - - proto_register_field_array(proto_mgcp, hf, array_length(hf)); - proto_register_subtree_array(ett, array_length(ett)); - } /* The registration hand-off routine */ diff --git a/plugins/plugin_api.c b/plugins/plugin_api.c index 942c5cbbbe..a9c2ad7749 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.13 2000/11/15 07:07:49 guy Exp $ + * $Id: plugin_api.c,v 1.14 2001/01/03 07:53:47 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> @@ -135,7 +135,7 @@ plugin_address_table_init(plugin_address_table_t *pat) p_tvb_strneql = pat->p_tvb_strneql; p_tvb_strncaseeql = pat->p_tvb_strncaseeql; p_tvb_bytes_to_str = pat->p_tvb_bytes_to_str; - p_prefs_register_module = pat->p_prefs_register_module; + p_prefs_register_protocol = pat->p_prefs_register_protocol; p_prefs_register_uint_preference = pat->p_prefs_register_uint_preference; p_prefs_register_bool_preference = pat->p_prefs_register_bool_preference; p_prefs_register_enum_preference = pat->p_prefs_register_enum_preference; diff --git a/plugins/plugin_api.h b/plugins/plugin_api.h index 6b6e24cbff..379309137f 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.13 2000/11/29 09:49:27 guy Exp $ + * $Id: plugin_api.h,v 1.14 2001/01/03 07:53:47 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> @@ -153,7 +153,7 @@ #define tvb_bytes_to_str (*p_tvb_bytes_to_str) -#define prefs_register_module (*p_prefs_register_module) +#define prefs_register_protocol (*p_prefs_register_protocol) #define prefs_register_uint_preference (*p_prefs_register_uint_preference) #define prefs_register_bool_preference (*p_prefs_register_bool_preference) #define prefs_register_enum_preference (*p_prefs_register_enum_preference) diff --git a/plugins/plugin_table.h b/plugins/plugin_table.h index f8507279c2..f26b867b4e 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.12 2001/01/03 07:37:29 guy Exp $ + * $Id: plugin_table.h,v 1.13 2001/01/03 07:53:47 guy Exp $ * * Ethereal - Network traffic analyzer * Copyright 2000 by Gilbert Ramirez <gram@xiexie.org> @@ -163,8 +163,8 @@ typedef gint (*addr_tvb_strncaseeql)(tvbuff_t*, gint, const guint8 *, gint); typedef gchar *(*addr_tvb_bytes_to_str)(tvbuff_t*, gint, gint len); -typedef struct pref_module *(*addr_prefs_register_module)(const char *, - const char *, void (*)(void)); +typedef struct pref_module *(*addr_prefs_register_protocol)(int, + void (*)(void)); typedef void (*addr_prefs_register_uint_preference)(struct pref_module *, const char *, const char *, const char *, guint, guint *); typedef void (*addr_prefs_register_bool_preference)(struct pref_module *, @@ -295,7 +295,7 @@ typedef struct { addr_tvb_bytes_to_str p_tvb_bytes_to_str; - addr_prefs_register_module p_prefs_register_module; + addr_prefs_register_protocol p_prefs_register_protocol; addr_prefs_register_uint_preference p_prefs_register_uint_preference; addr_prefs_register_bool_preference p_prefs_register_bool_preference; addr_prefs_register_enum_preference p_prefs_register_enum_preference; |