[svn-commits] file: trunk r45679 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu Oct 19 11:06:14 2006
New Revision: 45679

URL: http://svn.digium.com/view/asterisk?rev=45679&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=45679&r1=45678&r2=45679&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Oct 19 11:06:14 2006
@@ -16412,6 +16412,8 @@
 
 	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);