[asterisk-commits] file: trunk r69672 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Jun 18 11:06:17 2007
New Revision: 69672

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69672
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=69672&r1=69671&r2=69672
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Jun 18 11:06:17 2007
@@ -14581,14 +14581,16 @@
 	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! */