From: Terry Wilson <twilson@digium.com>
Date: Wed, 18 May 2011 23:11:57 +0000 (+0000)
Subject: Merged revisions 319652 via svnmerge from
X-Git-Tag: 1.6.2.19-rc1~3^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0640d5f616baf3ae1ce7bde00f29467d957a845b;p=thirdparty%2Fasterisk.git

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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@319653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a153f15e18..1ac756a400 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -21209,6 +21209,10 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
 			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)
 		ao2_t_ref(targetcall_pvt, -1, "drop targetcall_pvt");