diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-09-02 21:40:46 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-09-02 21:40:46 +0000 |
| commit | 8d9c5d9b2b006d58f493f52a3fb9e25ae70d61ac (patch) | |
| tree | cb44013088b9a0a506145cf3eec1872a405ef71f /epan/dissectors/packet-dtpt.c | |
| parent | 80b87dfaf36ea8cf8e937ea56c4bdff2c5cdc132 (diff) | |
Cleanup related to prefs & proto_reg_handoff
svn path=/trunk/; revision=26124
Diffstat (limited to 'epan/dissectors/packet-dtpt.c')
| -rw-r--r-- | epan/dissectors/packet-dtpt.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index cfef3cb89a..a71c9e187f 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -134,8 +134,7 @@ static gint ett_dtpt_blob = -1; static dissector_handle_t dtpt_conversation_handle; -static dissector_handle_t dtpt_data_handle; -static dissector_handle_t dtpt_handle; +/** static dissector_handle_t dtpt_data_handle; **/ static dissector_handle_t data_handle; @@ -845,13 +844,19 @@ dissect_dtpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_reg_handoff_dtpt(void) { - static int Initialized=FALSE; + static dissector_handle_t dtpt_handle; + static gboolean Initialized=FALSE; static int ServerPort=0; - if (Initialized) { - dissector_delete("tcp.port", ServerPort, dtpt_handle); - } else { + if (!Initialized) { + dtpt_handle = new_create_dissector_handle(dissect_dtpt, proto_dtpt); + dtpt_conversation_handle = new_create_dissector_handle(dissect_dtpt_conversation, proto_dtpt); +/** dtpt_data_handle = new_create_dissector_handle(dissect_dtpt_data, proto_dtpt); **/ + + data_handle = find_dissector("data"); Initialized=TRUE; + } else { + dissector_delete("tcp.port", ServerPort, dtpt_handle); } /* set port for future deletes */ @@ -1184,11 +1189,6 @@ proto_register_dtpt(void) proto_register_field_array(proto_dtpt, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - dtpt_conversation_handle = new_create_dissector_handle(dissect_dtpt_conversation, proto_dtpt); - dtpt_data_handle = new_create_dissector_handle(dissect_dtpt_data, proto_dtpt); - dtpt_handle = new_create_dissector_handle(dissect_dtpt, proto_dtpt); - data_handle = find_dissector("data"); - /* Register a configuration option for port */ dtpt_module = prefs_register_protocol(proto_dtpt, proto_reg_handoff_dtpt); |