kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_sip: Fix an issue where an incompatible audio format may be added to SDP.

Browse Source 
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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@401498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2013-10-23 11:11:18 +00:00
parent 0336f4b606
commit aa0fcfff6b
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
channels/chan_sip.c
View File

@@ -13197,19 +13197,18 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
*/ */
/* Prefer the audio codec we were requested to use, first, no matter what /* Prefer the audio codec we were requested to use, first, no matter what
Note that p->prefcodec can include video codecs, so mask them out Note that p->prefcodec can include video codecs, so ignore them
*/ */
if (ast_format_cap_has_joint(tmpcap, p->prefcaps)) { ast_format_cap_iter_start(p->prefcaps);
ast_format_cap_iter_start(p->prefcaps); while (!(ast_format_cap_iter_next(p->prefcaps, &tmp_fmt))) {
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; continue;
}
add_codec_to_sdp(p, &tmp_fmt, &m_audio, &a_audio, debug, &min_audio_packet_size);
ast_format_cap_add(alreadysent, &tmp_fmt);
} }
ast_format_cap_iter_end(p->prefcaps); add_codec_to_sdp(p, &tmp_fmt, &m_audio, &a_audio, debug, &min_audio_packet_size);
ast_format_cap_add(alreadysent, &tmp_fmt);
} }
ast_format_cap_iter_end(p->prefcaps);
/* Start by sending our preferred audio/video codecs */ /* Start by sending our preferred audio/video codecs */
for (x = 0; x < AST_CODEC_PREF_SIZE; x++) { for (x = 0; x < AST_CODEC_PREF_SIZE; x++) {