diff options
Diffstat (limited to 'epan/dissectors/asn1/rua/packet-rua-template.c')
| -rw-r--r-- | epan/dissectors/asn1/rua/packet-rua-template.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/epan/dissectors/asn1/rua/packet-rua-template.c b/epan/dissectors/asn1/rua/packet-rua-template.c index fd3ffcd989..896d6e52b8 100644 --- a/epan/dissectors/asn1/rua/packet-rua-template.c +++ b/epan/dissectors/asn1/rua/packet-rua-template.c @@ -29,19 +29,19 @@ #define PSNAME "RUA" #define PFNAME "rua" /* Dissector to use SCTP PPID 19 or a configured SCTP port. IANA assigned port = 29169*/ -#define SCTP_PORT_RUA 29169; +#define SCTP_PORT_RUA 29169 void proto_register_rua(void); #include "packet-rua-val.h" /* Initialize the protocol and registered fields */ -static int proto_rua = -1; +static int proto_rua; #include "packet-rua-hf.c" /* Initialize the subtree pointers */ -static int ett_rua = -1; +static int ett_rua; /* initialise sub-dissector handles */ static dissector_handle_t ranap_handle = NULL; @@ -51,7 +51,6 @@ static int ett_rua = -1; /* Global variables */ static guint32 ProcedureCode; static guint32 ProtocolIE_ID; -static guint global_sctp_port = SCTP_PORT_RUA /* Dissector tables */ static dissector_table_t rua_ies_dissector_table; @@ -115,7 +114,6 @@ dissect_rua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) /*--- proto_register_rua -------------------------------------------*/ void proto_register_rua(void) { -module_t *rua_module; /* List of fields */ @@ -147,8 +145,7 @@ module_t *rua_module; rua_proc_sout_dissector_table = register_dissector_table("rua.proc.sout", "RUA-ELEMENTARY-PROCEDURE SuccessfulOutcome", proto_rua, FT_UINT32, BASE_DEC); rua_proc_uout_dissector_table = register_dissector_table("rua.proc.uout", "RUA-ELEMENTARY-PROCEDURE UnsuccessfulOutcome", proto_rua, FT_UINT32, BASE_DEC); - rua_module = prefs_register_protocol(proto_rua, proto_reg_handoff_rua); - prefs_register_uint_preference(rua_module, "port", "RUA SCTP Port", "Set the port for RUA messages (Default of 29169)", 10, &global_sctp_port); + /* rua_module = prefs_register_protocol(proto_rua, NULL); */ } @@ -157,19 +154,8 @@ module_t *rua_module; void proto_reg_handoff_rua(void) { - static gboolean initialized = FALSE; - static guint sctp_port; - - if (!initialized) { - ranap_handle = find_dissector_add_dependency("ranap", proto_rua); - dissector_add_uint("sctp.ppi", RUA_PAYLOAD_PROTOCOL_ID, rua_handle); - initialized = TRUE; + ranap_handle = find_dissector_add_dependency("ranap", proto_rua); + dissector_add_uint("sctp.ppi", RUA_PAYLOAD_PROTOCOL_ID, rua_handle); + dissector_add_uint_with_preference("sctp.port", SCTP_PORT_RUA, rua_handle); #include "packet-rua-dis-tab.c" - - } else { - dissector_delete_uint("sctp.port", sctp_port, rua_handle); - } - /* Set our port number for future use */ - sctp_port = global_sctp_port; - dissector_add_uint("sctp.port", sctp_port, rua_handle); } |