From: David Vossel <dvossel@digium.com>
Date: Mon, 9 May 2011 17:09:55 +0000 (+0000)
Subject: Merged revisions 318230 via svnmerge from
X-Git-Tag: 1.8.5-rc1~11^2~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0d4192e2df964743144ade0ba3efacdad134924;p=thirdparty%2Fasterisk.git

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/branches/1.8@318233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c158bee25f..d092e3bf35 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -27923,8 +27923,11 @@ 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;
+	}
 
 	/*
 	 * Lock both the pvt and it's owner safely.