diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-10-07 13:50:11 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-10-08 06:15:51 +0000 |
| commit | ec82648b0989d409adcc404df69b691a260f16e9 (patch) | |
| tree | e38922d9fe1f1b99f8eecb34c0a45238ba753324 /epan/dissectors/packet-opensafety.c | |
| parent | 4a20f576da686237bcb66edeb1e195364ddd2a49 (diff) | |
Replace or rename "duplicate" UDP protocols shown in Decode As
Change-Id: I8cfd1c223c70c7e03728af8b2f7cbf9354d7ad86
Ping-Bug: 3949
Reviewed-on: https://code.wireshark.org/review/10865
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-opensafety.c')
| -rw-r--r-- | epan/dissectors/packet-opensafety.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index f389d14e4b..f0507898f8 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -2374,8 +2374,8 @@ dissect_opensafety_udpdata(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree static void apply_prefs ( void ) { - static dissector_handle_t opensafety_udpdata_handle; - static dissector_handle_t opensafety_siii_handle; + static dissector_handle_t opensafety_udpdata_handle = NULL; + static dissector_handle_t opensafety_siii_handle = NULL; static guint opensafety_udp_port_number; static guint opensafety_udp_siii_port_number; static gboolean opensafety_init = FALSE; @@ -2400,12 +2400,12 @@ apply_prefs ( void ) opensafety_udp_siii_port_number = global_network_udp_port_sercosiii; /* Default UDP only based dissector */ - dissector_add_uint("udp.port", opensafety_udp_port_number, find_dissector("opensafety_udpdata")); + dissector_add_uint("udp.port", opensafety_udp_port_number, opensafety_udpdata_handle); /* Sercos III dissector does not handle UDP transport, has to be handled * separately, everything else should be caught by the heuristic dissector */ - dissector_add_uint("udp.port", opensafety_udp_siii_port_number, find_dissector("opensafety_siii")); + dissector_add_uint("udp.port", opensafety_udp_siii_port_number, opensafety_siii_handle); } |