diff options
| author | Bill Meier <wmeier@newsguy.com> | 2008-10-28 00:29:15 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2008-10-28 00:29:15 +0000 |
| commit | 278b32d71f0d2b5769d0a72a366c684df419b25f (patch) | |
| tree | 01c2419a96fbe3b57137209e240192ab3d26c7c8 /plugins/unistim/packet-unistim.c | |
| parent | 7bd9f5f4831b584bf95d542d33a7232b01c1b7d0 (diff) | |
Minor cleanup related to proto_register/proto_reg_handoff ...
svn path=/trunk/; revision=26596
Diffstat (limited to 'plugins/unistim/packet-unistim.c')
| -rw-r--r-- | plugins/unistim/packet-unistim.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index 0bb4de60a6..caf5599eff 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -50,7 +50,7 @@ /* Don't set this to 5000 until this dissector is made a heuristic one! It collides (at least) with tapa. */ -static int global_unistim_port = 0; +static guint global_unistim_port = 0; static unistim_info_t *uinfo; static int unistim_tap = -1; @@ -58,7 +58,6 @@ static int unistim_tap = -1; void proto_reg_handoff_unistim(void); static void dissect_payload(proto_tree *unistim_tree,tvbuff_t *tvb,gint offset, packet_info *pinfo); static void dissect_unistim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -static dissector_handle_t unistim_handle; static gint dissect_broadcast_switch(proto_tree *msg_tree, tvbuff_t *tvb,gint offset,guint msg_len); @@ -193,19 +192,24 @@ proto_register_unistim(void){ void proto_reg_handoff_unistim(void) { - static gboolean initialized=FALSE; - static int unistim_port = 0; + static gboolean initialized = FALSE; + static dissector_handle_t unistim_handle; + static guint unistim_port; - if(initialized!=TRUE){ + if (!initialized) { unistim_handle=create_dissector_handle(dissect_unistim,proto_unistim); + dissector_add_handle("udp.port", unistim_handle); /* for "decode as" */ initialized=TRUE; } else { - dissector_delete("udp.port",unistim_port,unistim_handle); + if (unistim_port != 0) { + dissector_delete("udp.port",unistim_port,unistim_handle); + } } + if (global_unistim_port != 0) { + dissector_add("udp.port",global_unistim_port,unistim_handle); + } unistim_port = global_unistim_port; - - dissector_add("udp.port",global_unistim_port,unistim_handle); } |