From: Joshua Colp <jcolp@digium.com>
Date: Tue, 19 May 2009 14:41:45 +0000 (+0000)
Subject: Fix a bug where direct RTP setup would partially occur even when disabled if the... 
X-Git-Tag: 1.4.26~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64c1093e143199d34c7471bbe6a6159ca269435e;p=thirdparty%2Fasterisk.git

Fix a bug where direct RTP setup would partially occur even when disabled if the calling channel was answered.

(issue #13545)
Reported by: davidw
(issue #14244)
Reported by: mbnwa


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 3bc29bb75b..82233b929f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -18528,7 +18528,7 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, struc
 		return -1;
 
 	/* Disable early RTP bridge  */
-	if (chan->_state != AST_STATE_UP && !global_directrtpsetup) 	/* We are in early state */
+	if (!ast_bridged_channel(chan) && !global_directrtpsetup) 	/* We are in early state */
 		return 0;
 
 	ast_mutex_lock(&p->lock);