Merged revisions 318233 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r318233 | dvossel | 2011-05-09 12:09:55 -0500 (Mon, 09 May 2011) | 14 lines

  Merged revisions 318230 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r318230 | dvossel | 2011-05-09 11:51:45 -0500 (Mon, 09 May 2011) | 7 lines

    Fixes cases where sip_set_rtp_peer can return too early during media path reset.

    (closes issue #19225)
    Reported by: one47
    Patches:
          sip_set_rtp_peer.patch uploaded by one47 (license 23)
  ........
................

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 36866ba..dc97c11 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -28286,8 +28286,10 @@ static int sip_set_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance *i
        }
 
        /* Disable early RTP bridge  */
-       if (!ast_bridged_channel(chan) && !sip_cfg.directrtpsetup) {    /* We are in early state */
-               return 0;
+       if ((instance || vinstance || tinstance) &&
+               !ast_bridged_channel(chan) &&
+               !sip_cfg.directrtpsetup) {
+                       return 0;
        }
 
        /*