From ceb2c7bc489855e3a6f95f9fe4a947f64aa1dbef Mon Sep 17 00:00:00 2001 From: Joshua Colp <jcolp@digium.com> Date: Thu, 19 Oct 2006 16:06:14 +0000 Subject: [PATCH] Merged revisions 45678 via svnmerge from 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f98bc35acd..7c60bdfe5f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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); -- GitLab