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

[SVN commits to the Digium repositories]

Author: file
Date: Fri May 29 12:51:06 2009
New Revision: 197996

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197996
Log:
Fix a bug where the default setting did not perform a remote bridge when it should have.

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=197996&r1=197995&r2=197996
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri May 29 12:51:06 2009
@@ -25080,9 +25080,7 @@
 	ao2_ref(p->rtp, +1);
 	*instance = p->rtp;
 
-        if (!ast_test_flag(&p->flags[0], SIP_CAN_REINVITE_NAT)) {
-                res = AST_RTP_GLUE_RESULT_LOCAL;
-	} else if (ast_test_flag(&p->flags[0], SIP_CAN_REINVITE)) {
+	if (ast_test_flag(&p->flags[0], SIP_CAN_REINVITE | SIP_CAN_REINVITE_NAT)) {
                 res = AST_RTP_GLUE_RESULT_REMOTE;
 	} else if (ast_test_flag(&global_jbconf, AST_JB_FORCED)) {
                 res = AST_RTP_GLUE_RESULT_FORBID;