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-slimp3.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-slimp3.c')
| -rw-r--r-- | epan/dissectors/packet-slimp3.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 504733e313..43f7ff4558 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -68,8 +68,9 @@ static int hf_slimp3_data_data = -1; static gint ett_slimp3 = -1; -#define UDP_PORT_SLIMP3_V1 1069 +#define UDP_PORT_SLIMP3_V1 1069 /* Not IANA registered */ #define UDP_PORT_SLIMP3_V2 3483 +#define UDP_PORT_SLIMP3_RANGE "1069,3483" #define SLIMP3_IR 'i' #define SLIMP3_CONTROL 's' @@ -701,8 +702,7 @@ proto_register_slimp3(void) &ett_slimp3, }; - proto_slimp3 = proto_register_protocol("SliMP3 Communication Protocol", - "SliMP3", "slimp3"); + proto_slimp3 = proto_register_protocol("SliMP3 Communication Protocol", "SliMP3", "slimp3"); proto_register_field_array(proto_slimp3, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); } @@ -713,8 +713,7 @@ proto_reg_handoff_slimp3(void) dissector_handle_t slimp3_handle; slimp3_handle = create_dissector_handle(dissect_slimp3, proto_slimp3); - dissector_add_uint("udp.port", UDP_PORT_SLIMP3_V1, slimp3_handle); - dissector_add_uint("udp.port", UDP_PORT_SLIMP3_V2, slimp3_handle); + dissector_add_uint_range_with_preference("udp.port", UDP_PORT_SLIMP3_RANGE, slimp3_handle); } /* |