From: Terry Wilson <twilson@digium.com>
Date: Wed, 18 May 2011 23:04:35 +0000 (+0000)
Subject: Make sure everyone gets an unhold when a transfer succeeds
X-Git-Tag: 1.4.42-rc2~3^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5819437ae0e3d40f890ccf2cb2e42ff3c62bc09;p=thirdparty%2Fasterisk.git

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.4@319652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9108d178cb..e38f8c3132 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16105,6 +16105,10 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
 				ast_log(LOG_DEBUG, "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);
+		}
 	}
 	return 1;
 }