diff options
| author | John Thacker <johnthacker@gmail.com> | 2022-07-29 23:56:20 -0400 |
|---|---|---|
| committer | A Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2022-07-31 07:37:11 +0000 |
| commit | 5c15ebb9a23d1c9a7773d2eccf1df634ac5ff168 (patch) | |
| tree | 86935b04529cd5fe25271d88f2dcfd5aab671d74 /epan/dissectors/packet-lapd.c | |
| parent | 39ca9db96a83c6c4fae8c7463d3ba6b66624e349 (diff) | |
prefs: Convert most RTP dissectors to use "auto" PT preferences
Similar to commit 2eb7b05b8c9c6408268f0d1e81f0a18a02610f1c,
replace the RTP payload type preferences with automatic
dissectors.
This reduces the number of preference module callbacks.
Diffstat (limited to 'epan/dissectors/packet-lapd.c')
| -rw-r--r-- | epan/dissectors/packet-lapd.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 5101d1b030..78e6bf35ba 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -69,7 +69,6 @@ static gint ett_lapd_address = -1; static gint ett_lapd_control = -1; static gint ett_lapd_checksum = -1; -static range_t *pref_lapd_rtp_payload_type_range = NULL; static guint pref_lapd_sctp_ppi = 0; static expert_field ei_lapd_abort = EI_INIT; @@ -787,11 +786,7 @@ proto_register_lapd(void) "Use GSM SAPI values", "Use SAPI values as specified in TS 48 056", &global_lapd_gsm_sapis); - prefs_register_range_preference(lapd_module, "rtp_payload_type", - "RTP payload types for embedded LAPD", - "RTP payload types for embedded LAPD" - "; values must be in the range 1 - 127", - &pref_lapd_rtp_payload_type_range, 127); + prefs_register_obsolete_preference(lapd_module, "rtp_payload_type"); prefs_register_uint_preference(lapd_module, "sctp_payload_protocol_identifier", "SCTP Payload Protocol Identifier for LAPD", "SCTP Payload Protocol Identifier for LAPD. It is a " @@ -803,7 +798,6 @@ void proto_reg_handoff_lapd(void) { static gboolean init = FALSE; - static range_t* lapd_rtp_payload_type_range = NULL; static guint lapd_sctp_ppi; dissector_handle_t lapd_frame_handle; @@ -817,20 +811,14 @@ proto_reg_handoff_lapd(void) dissector_add_for_decode_as("sctp.ppi", lapd_handle); dissector_add_for_decode_as("sctp.port", lapd_handle); dissector_add_uint_range_with_preference("udp.port", "", lapd_handle); + dissector_add_uint_range_with_preference("rtp.pt", "", lapd_bitstream_handle); init = TRUE; } else { - dissector_delete_uint_range("rtp.pt", lapd_rtp_payload_type_range, lapd_bitstream_handle); - wmem_free(wmem_epan_scope(), lapd_rtp_payload_type_range); - if (lapd_sctp_ppi > 0) dissector_delete_uint("sctp.ppi", lapd_sctp_ppi, lapd_handle); } - lapd_rtp_payload_type_range = range_copy(wmem_epan_scope(), pref_lapd_rtp_payload_type_range); - range_remove_value(wmem_epan_scope(), &lapd_rtp_payload_type_range, 0); - dissector_add_uint_range("rtp.pt", lapd_rtp_payload_type_range, lapd_bitstream_handle); - lapd_sctp_ppi = pref_lapd_sctp_ppi; if (lapd_sctp_ppi > 0) dissector_add_uint("sctp.ppi", lapd_sctp_ppi, lapd_handle); |