From 0cf1778eed4754570a36938e1f5d212951320a71 Mon Sep 17 00:00:00 2001 From: Alexander Traud Date: Tue, 13 Sep 2016 11:08:34 +0200 Subject: rtp_engine: Allow more than 32 dynamic payload types. The dynamic range (96-127) allows 32 RTP Payload Types. RFC 3551 section 3 allows to reassign other ranges. Consequently, when the dynamic range is exhausted, you can go for "rtp_pt_dynamic = 35" (or 0) in asterisk.conf. This enables the range 35-63 (or 0-63) giving room for another 29 (or 64) payload types. ASTERISK-26311 #close Change-Id: I7bc96ab764bc30098a178b841cbf7146f9d64964 (cherry picked from commit 9ac53877f688c06acaa7c377f15da8770e4ee88b) --- main/rtp_engine.c | 87 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 16 deletions(-) (limited to 'main/rtp_engine.c') diff --git a/main/rtp_engine.c b/main/rtp_engine.c index 7a8378346..051253103 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -145,23 +145,36 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include - -#include "asterisk/channel.h" -#include "asterisk/frame.h" -#include "asterisk/module.h" -#include "asterisk/rtp_engine.h" +#include /* for sqrt, MAX */ +#include /* for sched_yield */ +#include /* for timeval */ +#include /* for time_t */ + +#include "asterisk/_private.h" /* for ast_rtp_engine_init prototype */ +#include "asterisk/astobj2.h" /* for ao2_cleanup, ao2_ref, etc */ +#include "asterisk/channel.h" /* for ast_channel_name, etc */ +#include "asterisk/codec.h" /* for ast_codec_media_type2str, etc */ +#include "asterisk/format.h" /* for ast_format_cmp, etc */ +#include "asterisk/format_cache.h" /* for ast_format_adpcm, etc */ +#include "asterisk/format_cap.h" /* for ast_format_cap_alloc, etc */ +#include "asterisk/json.h" /* for ast_json_ref, etc */ +#include "asterisk/linkedlists.h" /* for ast_rtp_engine::, etc */ +#include "asterisk/lock.h" /* for ast_rwlock_unlock, etc */ +#include "asterisk/logger.h" /* for ast_log, ast_debug, etc */ #include "asterisk/manager.h" -#include "asterisk/options.h" -#include "asterisk/astobj2.h" -#include "asterisk/pbx.h" -#include "asterisk/translate.h" -#include "asterisk/netsock2.h" -#include "asterisk/_private.h" -#include "asterisk/framehook.h" -#include "asterisk/stasis.h" -#include "asterisk/json.h" -#include "asterisk/stasis_channels.h" +#include "asterisk/module.h" /* for ast_module_unref, etc */ +#include "asterisk/netsock2.h" /* for ast_sockaddr_copy, etc */ +#include "asterisk/options.h" /* for ast_option_rtpptdynamic */ +#include "asterisk/pbx.h" /* for pbx_builtin_setvar_helper */ +#include "asterisk/res_srtp.h" /* for ast_srtp_res */ +#include "asterisk/rtp_engine.h" /* for ast_rtp_codecs, etc */ +#include "asterisk/stasis.h" /* for stasis_message_data, etc */ +#include "asterisk/stasis_channels.h" /* for ast_channel_stage_snapshot, etc */ +#include "asterisk/strings.h" /* for ast_str_append, etc */ +#include "asterisk/time.h" /* for ast_tvdiff_ms, ast_tvnow */ +#include "asterisk/translate.h" /* for ast_translate_available_formats */ +#include "asterisk/utils.h" /* for ast_free, ast_strdup, etc */ +#include "asterisk/vector.h" /* for AST_VECTOR_GET, etc */ struct ast_srtp_res *res_srtp = NULL; struct ast_srtp_policy_res *res_srtp_policy = NULL; @@ -1796,6 +1809,48 @@ static void add_static_payload(int map, struct ast_format *format, int rtp_code) } } + /* http://www.iana.org/assignments/rtp-parameters + * RFC 3551, Section 3: "[...] applications which need to define more + * than 32 dynamic payload types MAY bind codes below 96, in which case + * it is RECOMMENDED that unassigned payload type numbers be used + * first". Updated by RFC 5761, Section 4: "[...] values in the range + * 64-95 MUST NOT be used [to avoid conflicts with RTCP]". Summaries: + * https://tools.ietf.org/html/draft-roach-mmusic-unified-plan#section-3.2.1.2 + * https://tools.ietf.org/html/draft-wu-avtcore-dynamic-pt-usage#section-3 + */ + if (map < 0) { + for (x = MAX(ast_option_rtpptdynamic, 35); x <= AST_RTP_PT_LAST_REASSIGN; ++x) { + if (!static_RTP_PT[x]) { + map = x; + break; + } + } + } + /* Yet, reusing mappings below 35 is not supported in Asterisk because + * when Compact Headers are activated, no rtpmap is send for those below + * 35. If you want to use 35 and below + * A) do not use Compact Headers, + * B) remove that code in chan_sip/res_pjsip, or + * C) add a flag that this RTP Payload Type got reassigned dynamically + * and requires a rtpmap even with Compact Headers enabled. + */ + if (map < 0) { + for (x = MAX(ast_option_rtpptdynamic, 20); x < 35; ++x) { + if (!static_RTP_PT[x]) { + map = x; + break; + } + } + } + if (map < 0) { + for (x = MAX(ast_option_rtpptdynamic, 0); x < 20; ++x) { + if (!static_RTP_PT[x]) { + map = x; + break; + } + } + } + if (map < 0) { if (format) { ast_log(LOG_WARNING, "No Dynamic RTP mapping available for format %s\n", -- cgit v1.2.3