From: Joshua Colp <jcolp@digium.com>
Date: Mon, 18 Jun 2007 16:06:17 +0000 (+0000)
Subject: Merged revisions 69668 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2354
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dbfbe6d710f54cb41b527c1ecf3fbac3667f9df;p=thirdparty%2Fasterisk.git

Merged revisions 69668 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69668 | file | 2007-06-18 12:04:55 -0400 (Mon, 18 Jun 2007) | 2 lines

Don't defer the BYE till later on a transfer when the transfer itself goes kaboom and has no hope of working.

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7cff8fbda4..69a5fbfe02 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -14581,14 +14581,16 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
 	sip_pvt_unlock(targetcall_pvt);
 	if (res) {
 		/* Failed transfer */
-		/* Could find better message, but they will get the point */
-		transmit_notify_with_sipfrag(transferer, seqno, "486 Busy", TRUE);
+		transmit_notify_with_sipfrag(transferer, seqno, "486 Busy Here", TRUE);
 		append_history(transferer, "Xfer", "Refer failed");
+		transferer->refer->status = REFER_FAILED;
 		if (targetcall_pvt->owner)
 			ast_channel_unlock(targetcall_pvt->owner);
 		/* Right now, we have to hangup, sorry. Bridge is destroyed */
 		if (res != -2)
 			ast_hangup(transferer->owner);
+		else
+			ast_clear_flag(&transferer->flags[0], SIP_DEFER_BYE_ON_TRANSFER);
 	} else {
 		/* Transfer succeeded! */