[svn-commits] twilson: trunk r319661 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Wed May 18 18:18:32 2011
New Revision: 319661

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319661
Log:
Merged revisions 319654 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r319654 | twilson | 2011-05-18 16:15:58 -0700 (Wed, 18 May 2011) | 22 lines
  
  Merged revisions 319653 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r319653 | twilson | 2011-05-18 16:11:57 -0700 (Wed, 18 May 2011) | 15 lines
    
    Merged revisions 319652 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r319652 | twilson | 2011-05-18 16:04:35 -0700 (Wed, 18 May 2011) | 8 lines
      
      Make sure everyone gets an unhold when a transfer succeeds
      
      Some phones, like the Snom phones, send a hold to the transfer target after
      before sending the REFER. We need to make sure that we unhold the parties
      that are being connected after the masquerade. If Local channels with the /nm
      option are used when dialing the parties, hold music would still be playing on
      the transfer target, even after being connected with the transferee.
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=319661&r1=319660&r2=319661
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed May 18 18:18:32 2011
@@ -22659,6 +22659,9 @@
 		sip_pvt_lock(transferer); /* the transferer pvt is expected to remain locked on return */
 
 		ast_indicate(target.chan1, AST_CONTROL_UNHOLD);
+		if (target.chan2) {
+			ast_indicate(target.chan2, AST_CONTROL_UNHOLD);
+		}
 
 		if (current->chan2 && current->chan2->_state == AST_STATE_RING) {
 			ast_indicate(target.chan1, AST_CONTROL_RINGING);