kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-16 17:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 58240 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58240 | file | 2007-03-07 12:52:58 -0500 (Wed, 07 Mar 2007) | 2 lines

Ensure we have (or should have) at least one matching codec before attempting early bridge SDP seeding. (issue #9221 reported by marcelbarbulescu)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@58241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-03-07 17:55:11 +00:00
parent 061df74259
commit e7da006562
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/rtp.c
View File

@@ -1537,7 +1537,7 @@ int ast_rtp_early_bridge(struct ast_channel *c0, struct ast_channel *c1)
struct ast_rtp_protocol *destpr = NULL, *srcpr = NULL;
enum ast_rtp_get_result audio_dest_res = AST_RTP_GET_FAILED, video_dest_res = AST_RTP_GET_FAILED, text_dest_res = AST_RTP_GET_FAILED;
enum ast_rtp_get_result audio_src_res = AST_RTP_GET_FAILED, video_src_res = AST_RTP_GET_FAILED, text_src_res = AST_RTP_GET_FAILED;
int srccodec, nat_active = 0;
int srccodec, destcodec, nat_active = 0;
/* Lock channels */
ast_channel_lock(c0);
@@ -1592,6 +1592,17 @@ int ast_rtp_early_bridge(struct ast_channel *c0, struct ast_channel *c1)
srccodec = srcpr->get_codec(c1);
else
srccodec = 0;
if (audio_dest_res == AST_RTP_TRY_NATIVE && destpr->get_codec)
destcodec = destpr->get_codec(c0);
else
destcodec = 0;
/* Ensure we have at least one matching codec */
if (!(srccodec & destcodec)) {
ast_channel_unlock(c0);
if (c1)
ast_channel_unlock(c1);
return 0;
}
/* Consider empty media as non-existant */
if (audio_src_res == AST_RTP_TRY_NATIVE && !srcp->them.sin_addr.s_addr)
srcp = NULL;