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-sscop.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-sscop.c')
| -rw-r--r-- | epan/dissectors/packet-sscop.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c index 353ed41bc6..68f6b85aa1 100644 --- a/epan/dissectors/packet-sscop.c +++ b/epan/dissectors/packet-sscop.c @@ -56,10 +56,6 @@ static dissector_handle_t sscf_nni_handle; static dissector_handle_t alcap_handle; static dissector_handle_t nbap_handle; -static module_t *sscop_module; - -static range_t *global_udp_port_range; - static dissector_handle_t sscop_handle; @@ -387,22 +383,13 @@ void proto_reg_handoff_sscop(void) { static gboolean prefs_initialized = FALSE; - static range_t *udp_port_range; if (!prefs_initialized) { initialize_handles_once(); + dissector_add_uint_range_with_preference("udp.port", "", sscop_handle); prefs_initialized = TRUE; - - } else { - - dissector_delete_uint_range("udp.port", udp_port_range, sscop_handle); - g_free(udp_port_range); - } - udp_port_range = range_copy(global_udp_port_range); - dissector_add_uint_range("udp.port", udp_port_range, sscop_handle); - dissector_add_uint("atm.aal5.type", TRAF_SSCOP, sscop_handle); switch(sscop_payload_dissector) { @@ -438,6 +425,8 @@ proto_register_sscop(void) &ett_stat }; + module_t *sscop_module; + proto_sscop = proto_register_protocol("SSCOP", "SSCOP", "sscop"); proto_register_field_array(proto_sscop, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); @@ -446,13 +435,6 @@ proto_register_sscop(void) sscop_module = prefs_register_protocol(proto_sscop, proto_reg_handoff_sscop); - global_udp_port_range = range_empty(); - - prefs_register_range_preference(sscop_module, "udp.ports", - "SSCOP UDP port range", - "Set the UDP port for SSCOP messages encapsulated in UDP (0 to disable)", - &global_udp_port_range, MAX_UDP_PORT); - prefs_register_enum_preference(sscop_module, "payload", "SSCOP payload protocol", "SSCOP payload (dissector to call on SSCOP payload)", |