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-lmp.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-lmp.c')
-rw-r--r-- | epan/dissectors/packet-lmp.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index c1d3942203..5c90e636c4 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -58,8 +58,6 @@ void proto_reg_handoff_lmp(void); static int proto_lmp = -1; #define UDP_PORT_LMP_DEFAULT 701 -static guint lmp_udp_port = UDP_PORT_LMP_DEFAULT; -static guint lmp_udp_port_config = UDP_PORT_LMP_DEFAULT; static gboolean lmp_checksum_config = FALSE; @@ -1875,30 +1873,16 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) } static void -lmp_prefs_applied (void) -{ - if (lmp_udp_port != lmp_udp_port_config) { - dissector_delete_uint("udp.port", lmp_udp_port, lmp_handle); - lmp_udp_port = lmp_udp_port_config; - dissector_add_uint("udp.port", lmp_udp_port, lmp_handle); - } -} - -static void register_lmp_prefs (void) { module_t *lmp_module; - lmp_module = prefs_register_protocol(proto_lmp, lmp_prefs_applied); + lmp_module = prefs_register_protocol(proto_lmp, NULL); - prefs_register_uint_preference( - lmp_module, "udp_port", "LMP UDP Port", - "UDP port number to use for LMP", 10, &lmp_udp_port_config); prefs_register_bool_preference( lmp_module, "checksum", "LMP checksum field", "Whether LMP contains a checksum which can be checked", &lmp_checksum_config); - prefs_register_obsolete_preference( - lmp_module, "version"); + prefs_register_obsolete_preference(lmp_module, "version"); } void @@ -2635,8 +2619,7 @@ proto_register_lmp(void) } - proto_lmp = proto_register_protocol("Link Management Protocol (LMP)", - "LMP", "lmp"); + proto_lmp = proto_register_protocol("Link Management Protocol (LMP)", "LMP", "lmp"); expert_lmp = expert_register_protocol(proto_lmp); expert_register_field_array(expert_lmp, ei, array_length(ei)); @@ -2651,7 +2634,7 @@ void proto_reg_handoff_lmp(void) { lmp_handle = create_dissector_handle(dissect_lmp, proto_lmp); - dissector_add_uint("udp.port", lmp_udp_port, lmp_handle); + dissector_add_uint_with_preference("udp.port", UDP_PORT_LMP_DEFAULT, lmp_handle); } /* |