From 009f6f91125acfb6ac1d67bdb2f48fdd2f92a5b8 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Mon, 18 Jun 2007 16:04:55 +0000 Subject: [PATCH] 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/branches/1.4@69668 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7fdfb6f273..93c76be919 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13858,14 +13858,16 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual * ast_mutex_unlock(&targetcall_pvt->lock); 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! */