Skip to content
Snippets Groups Projects
Commit 1dbfbe6d authored by Joshua Colp's avatar Joshua Colp
Browse files

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
parent 3e4980da
Branches
Tags
No related merge requests found
...@@ -14581,14 +14581,16 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual * ...@@ -14581,14 +14581,16 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
sip_pvt_unlock(targetcall_pvt); sip_pvt_unlock(targetcall_pvt);
if (res) { if (res) {
/* Failed transfer */ /* Failed transfer */
/* Could find better message, but they will get the point */ transmit_notify_with_sipfrag(transferer, seqno, "486 Busy Here", TRUE);
transmit_notify_with_sipfrag(transferer, seqno, "486 Busy", TRUE);
append_history(transferer, "Xfer", "Refer failed"); append_history(transferer, "Xfer", "Refer failed");
transferer->refer->status = REFER_FAILED;
if (targetcall_pvt->owner) if (targetcall_pvt->owner)
ast_channel_unlock(targetcall_pvt->owner); ast_channel_unlock(targetcall_pvt->owner);
/* Right now, we have to hangup, sorry. Bridge is destroyed */ /* Right now, we have to hangup, sorry. Bridge is destroyed */
if (res != -2) if (res != -2)
ast_hangup(transferer->owner); ast_hangup(transferer->owner);
else
ast_clear_flag(&transferer->flags[0], SIP_DEFER_BYE_ON_TRANSFER);
} else { } else {
/* Transfer succeeded! */ /* Transfer succeeded! */
   
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment