[asterisk-commits] dvossel: branch 1.8 r318233 - in /branches/1.8: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon May  9 12:09:55 2011
New Revision: 318233

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

Modified:
    branches/1.8/   (props changed)
    branches/1.8/channels/chan_sip.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=318233&r1=318232&r2=318233
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Mon May  9 12:09:55 2011
@@ -27923,8 +27923,11 @@
 	}
 
 	/* 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.