[asterisk-commits] twilson: branch 1.6.2 r319653 - in /branches/1.6.2: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed May 18 18:11:57 2011
New Revision: 319653

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319653
Log:
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:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_sip.c

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

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=319653&r1=319652&r2=319653
==============================================================================
--- branches/1.6.2/channels/chan_sip.c (original)
+++ branches/1.6.2/channels/chan_sip.c Wed May 18 18:11:57 2011
@@ -21208,6 +21208,10 @@
 		if (targetcall_pvt->owner) {
 			ast_debug(1, "SIP attended transfer: Unlocking channel %s\n", targetcall_pvt->owner->name);
 			ast_channel_unlock(targetcall_pvt->owner);
+		}
+		ast_indicate(target.chan1, AST_CONTROL_UNHOLD);
+		if (target.chan2) {
+			ast_indicate(target.chan2, AST_CONTROL_UNHOLD);
 		}
 	}
 	if (targetcall_pvt)