kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@58240 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-03-07 17:52:58 +00:00
parent b393ff7feb
commit 240355d78b
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_sip.c
View File

@@ -17056,7 +17056,7 @@ static int sip_sipredirect(struct sip_pvt *p, const char *dest)
static int sip_get_codec(struct ast_channel *chan)
{
struct sip_pvt *p = chan->tech_pvt;
return p->peercapability;
return p->peercapability ? p->peercapability : p->capability;
}
/*! \brief Send a poke to all known peers

13
main/rtp.c
View File

@@ -1445,7 +1445,7 @@ int ast_rtp_early_bridge(struct ast_channel *dest, struct ast_channel *src)
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;
enum ast_rtp_get_result audio_src_res = AST_RTP_GET_FAILED, video_src_res = AST_RTP_GET_FAILED;
int srccodec, nat_active = 0;
int srccodec, destcodec, nat_active = 0;
/* Lock channels */
ast_channel_lock(dest);
@@ -1498,6 +1498,17 @@ int ast_rtp_early_bridge(struct ast_channel *dest, struct ast_channel *src)
srccodec = srcpr->get_codec(src);
else
srccodec = 0;
if (audio_dest_res == AST_RTP_TRY_NATIVE && destpr->get_codec)
destcodec = destpr->get_codec(dest);
else
destcodec = 0;
/* Ensure we have at least one matching codec */
if (!(srccodec & destcodec)) {
ast_channel_unlock(dest);
if (src)
ast_channel_unlock(src);
return 0;
}
/* Consider empty media as non-existant */
if (audio_src_res == AST_RTP_TRY_NATIVE && !srcp->them.sin_addr.s_addr)
srcp = NULL;