diff options
| author | Joshua Colp <jcolp@digium.com> | 2013-10-23 11:16:44 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2013-10-23 11:16:44 +0000 |
| commit | f4e028a765718d3c7f06bb5256084cff6d294930 (patch) | |
| tree | 275d7069cc2cea17a7ae2cf925bb06c6b5a21897 | |
| parent | 4ca92e3b8af8351a7d7cc66f9713b427c7cf1827 (diff) | |
chan_sip: Fix an issue where an incompatible audio format may be added to SDP.
If preferred codecs included any non-audio format the code would
mistakenly add the audio format, even if it was not a joint capability
with the remote side.
(closes issue ASTERISK-21131)
Reported by: nbougues
Patches:
patch_unsupported_codec_1.8.patch uploaded by nbougues (license 6470)
........
Merged revisions 401497 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 401498 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 401499 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401500 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1417e4f2e..9a4d28448 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13358,10 +13358,11 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int /* Unless otherwise configured, the prefcaps is added before the peer's * configured codecs. */ - if (!ast_test_flag(&p->flags[2], SIP_PAGE3_IGNORE_PREFCAPS) && ast_format_cap_has_joint(tmpcap, p->prefcaps)) { + if (!ast_test_flag(&p->flags[2], SIP_PAGE3_IGNORE_PREFCAPS)) { ast_format_cap_iter_start(p->prefcaps); while (!(ast_format_cap_iter_next(p->prefcaps, &tmp_fmt))) { - if (AST_FORMAT_GET_TYPE(tmp_fmt.id) != AST_FORMAT_TYPE_AUDIO) { + if (AST_FORMAT_GET_TYPE(tmp_fmt.id) != AST_FORMAT_TYPE_AUDIO || + !ast_format_cap_iscompatible(tmpcap, &tmp_fmt)) { continue; } add_codec_to_sdp(p, &tmp_fmt, &m_audio, &a_audio, debug, &min_audio_packet_size, &max_audio_packet_size); |