Merged revisions 45678 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 19 Oct 2006 16:06:14 +0000 (16:06 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 19 Oct 2006 16:06:14 +0000 (16:06 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45678 | file | 2006-10-19 12:03:09 -0400 (Thu, 19 Oct 2006) | 2 lines

If the jitterbuffer is forced on then we can't partially bridge (reported by wangster on #asterisk-dev)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45679 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index f98bc35..7c60bdf 100644 (file)
@@ -16412,6 +16412,8 @@ static enum ast_rtp_get_result sip_get_rtp_peer(struct ast_channel *chan, struct
 
        if (ast_test_flag(&p->flags[0], SIP_CAN_REINVITE))
                res = AST_RTP_TRY_NATIVE;
+       else if (ast_test_flag(&global_jbconf, AST_JB_FORCED))
+               res = AST_RTP_GET_FAILED;
 
        ast_mutex_unlock(&p->lock);