[svn-commits] dvossel: branch 1.6.2 r318230 - /branches/1.6.2/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Mon May  9 11:51:45 2011
New Revision: 318230

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=318230
Log:
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)

Modified:
    branches/1.6.2/channels/chan_sip.c

Modified: branches/1.6.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_sip.c?view=diff&rev=318230&r1=318229&r2=318230
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Mon May  9 11:51:45 2011
@@ -26052,8 +26052,11 @@
 		return -1;
 
 	/* Disable early RTP bridge  */
-	if (!ast_bridged_channel(chan) && !sip_cfg.directrtpsetup) 	/* We are in early state */
-		return 0;
+	if ((rtp || vrtp || trtp) &&
+		!ast_bridged_channel(chan) &&
+		!sip_cfg.directrtpsetup) {
+			return 0;
+	}
 
 	sip_pvt_lock(p);
 	if (p->alreadygone) {