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-bt-utp.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-bt-utp.c')
| -rw-r--r-- | epan/dissectors/packet-bt-utp.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/epan/dissectors/packet-bt-utp.c b/epan/dissectors/packet-bt-utp.c index adf19effdb..b1ff2b1403 100644 --- a/epan/dissectors/packet-bt-utp.c +++ b/epan/dissectors/packet-bt-utp.c @@ -466,13 +466,9 @@ proto_register_bt_utp(void) module_t *bt_utp_module; /* Register protocol */ - proto_bt_utp = proto_register_protocol ( - "uTorrent Transport Protocol", /* name */ - "BT-uTP", /* short name */ - "bt-utp" /* abbrev */ - ); + proto_bt_utp = proto_register_protocol ("uTorrent Transport Protocol", "BT-uTP", "bt-utp"); - bt_utp_module = prefs_register_protocol(proto_bt_utp, proto_reg_handoff_bt_utp); + bt_utp_module = prefs_register_protocol(proto_bt_utp, NULL); prefs_register_obsolete_preference(bt_utp_module, "enable"); proto_register_field_array(proto_bt_utp, hf, array_length(hf)); @@ -482,17 +478,11 @@ proto_register_bt_utp(void) void proto_reg_handoff_bt_utp(void) { - static gboolean prefs_initialized = FALSE; + /* disabled by default since heuristic is weak */ + heur_dissector_add("udp", dissect_bt_utp, "BitTorrent UTP over UDP", "bt_utp_udp", proto_bt_utp, HEURISTIC_DISABLE); - if (!prefs_initialized) { - /* disabled by default since heuristic is weak */ - heur_dissector_add("udp", dissect_bt_utp, "BitTorrent UTP over UDP", "bt_utp_udp", proto_bt_utp, HEURISTIC_DISABLE); - - bt_utp_handle = create_dissector_handle(dissect_bt_utp, proto_bt_utp); - dissector_add_for_decode_as("udp.port", bt_utp_handle); - - prefs_initialized = TRUE; - } + bt_utp_handle = create_dissector_handle(dissect_bt_utp, proto_bt_utp); + dissector_add_for_decode_as_with_preference("udp.port", bt_utp_handle); } /* |