diff options
author | Michael Mann <mmann78@netscape.net> | 2016-10-05 16:33:54 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-10-13 02:51:18 +0000 |
commit | 2eb7b05b8c9c6408268f0d1e81f0a18a02610f1c (patch) | |
tree | bd0a909e3d506ea2e61c446aa8a809b6f728af3b /epan/dissectors/packet-nordic_ble.c | |
parent | 4d8581d7e15fe4a80a53496b83a853271fc674b6 (diff) |
Convert most UDP dissectors to use "auto" preferences.
Similar to the "tcp.port" changes in I99604f95d426ad345f4b494598d94178b886eb67,
convert dissectors that use "udp.port".
More cleanup done on dissectors that use both TCP and UDP dissector
tables, so that less preference callbacks exist.
Change-Id: If07be9b9e850c244336a7069599cd554ce312dd3
Reviewed-on: https://code.wireshark.org/review/18120
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-nordic_ble.c')
-rw-r--r-- | epan/dissectors/packet-nordic_ble.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/epan/dissectors/packet-nordic_ble.c b/epan/dissectors/packet-nordic_ble.c index 596cc18117..902bb2df58 100644 --- a/epan/dissectors/packet-nordic_ble.c +++ b/epan/dissectors/packet-nordic_ble.c @@ -706,24 +706,19 @@ proto_register_nordic_ble(void) void proto_reg_handoff_nordic_ble(void) { - static gboolean initialized = FALSE; - static dissector_handle_t nordic_ble_handle; + dissector_handle_t nordic_ble_handle; /*static int currentPort;*/ - if (!initialized) { - nordic_ble_handle = create_dissector_handle(dissect_nordic_ble, proto_nordic_ble); + nordic_ble_handle = create_dissector_handle(dissect_nordic_ble, proto_nordic_ble); - btle_dissector_handle = find_dissector("btle"); - debug_handle = find_dissector("nordic_debug"); - initialized = TRUE; - } + btle_dissector_handle = find_dissector("btle"); + debug_handle = find_dissector("nordic_debug"); #ifdef TRANSPARENT - dissector_add_uint("udp.port", udp_port, btle_dissector_handle); + dissector_add_uint_with_preference("udp.port", udp_port, btle_dissector_handle); #else - /*dissector_add_uint("udp.port", udp_port, nordic_ble_handle);*/ /*dissector_add_uint("wtap_encap", user_dlt_num, nordic_ble_handle);*/ - dissector_add_for_decode_as("udp.port", nordic_ble_handle); + dissector_add_for_decode_as_with_preference("udp.port", nordic_ble_handle); #endif } |