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

(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 3bc29bb75b5e7e8fe7a0b509bd649aea4a9e9c63..82233b929fdb301b64e40936273c6c2b5646c01c 100644 (file)
--- 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);