From: Joshua Colp <jcolp@digium.com>
Date: Fri, 29 May 2009 17:51:06 +0000 (+0000)
Subject: Fix a bug where the default setting did not perform a remote bridge when it should... 
X-Git-Tag: 11.0.0-beta1~4777
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9944bce43c63806c52e073e40bd7c463b5c22dca;p=thirdparty%2Fasterisk.git

Fix a bug where the default setting did not perform a remote bridge when it should have.


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 3e074c7d21..fe6fd070c5 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -25080,9 +25080,7 @@ static enum ast_rtp_glue_result sip_get_rtp_peer(struct ast_channel *chan, struc
 	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;