aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-nsip.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2008-09-22 16:26:41 +0000
committerBill Meier <wmeier@newsguy.com>2008-09-22 16:26:41 +0000
commit6aa5f8aa6af33baa7b2f37e14cbfc3e73136b333 (patch)
tree809bb5319c74d76eab725742a75769e9e890a76a /epan/dissectors/packet-nsip.c
parentc08a1f420e484941db43234a2236c57df6a9ef45 (diff)
Minor cleanup related to proto_reg_handoff
svn path=/trunk/; revision=26246
Diffstat (limited to 'epan/dissectors/packet-nsip.c')
-rw-r--r--epan/dissectors/packet-nsip.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index 2424a194d3..6b6c348112 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -43,7 +43,6 @@
#define NSIP_LITTLE_ENDIAN 0
static range_t *global_nsip_udp_port_range;
-static range_t *nsip_udp_port_range;
#define DEFAULT_NSIP_PORT_RANGE "2157,19999"
void proto_reg_handoff_nsip(void);
@@ -1117,7 +1116,6 @@ proto_register_nsip(void)
/* Set default UDP ports */
range_convert_str(&global_nsip_udp_port_range, DEFAULT_NSIP_PORT_RANGE, MAX_UDP_PORT);
- nsip_udp_port_range = range_empty();
/* Register configuration options */
nsip_module = prefs_register_protocol(proto_nsip, proto_reg_handoff_nsip);
@@ -1143,19 +1141,20 @@ range_add_callback(guint32 port)
void
proto_reg_handoff_nsip(void) {
- static int nsip_prefs_initialized = FALSE;
+ static gboolean nsip_prefs_initialized = FALSE;
+ static range_t *nsip_udp_port_range;
if (!nsip_prefs_initialized) {
- nsip_handle = create_dissector_handle(dissect_nsip, proto_nsip);
+ nsip_handle = find_dissector("nsip");
+ bssgp_handle = find_dissector("bssgp");
nsip_prefs_initialized = TRUE;
} else {
range_foreach(nsip_udp_port_range, range_delete_callback);
+ g_free(nsip_udp_port_range);
}
- g_free(nsip_udp_port_range);
nsip_udp_port_range = range_copy(global_nsip_udp_port_range);
range_foreach(nsip_udp_port_range, range_add_callback);
- bssgp_handle = find_dissector("bssgp");
}