Merged revisions 195448 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Tue, 19 May 2009 14:43:54 +0000 (14:43 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 19 May 2009 14:43:54 +0000 (14:43 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r195448 | file | 2009-05-19 11:41:45 -0300 (Tue, 19 May 2009) | 7 lines

  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/trunk@195449 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index fd30dfd..44f3dbb 100644 (file)
@@ -24775,7 +24775,7 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *i
                 return -1;
 
        /* Disable early RTP bridge  */
-       if (chan->_state != AST_STATE_UP && !sip_cfg.directrtpsetup)    /* We are in early state */
+       if (!ast_bridged_channel(chan) && !sip_cfg.directrtpsetup)      /* We are in early state */
                return 0;
 
         sip_pvt_lock(p);