[asterisk-commits] twilson: branch 1.4 r169868 - /branches/1.4/res/res_features.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Jan 21 17:23:59 2009
New Revision: 169868

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=169868
Log:
Fix builtin_blindtransfer calling back the wrong channel

Blindtransfer also was calling back the wrong channel when a timeout occurred.
This should be the last of these, as there are no more masq_park_announce calls
that aren't passing orig_chan_name

Modified:
    branches/1.4/res/res_features.c

Modified: branches/1.4/res/res_features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=169868&r1=169867&r2=169868
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Wed Jan 21 17:23:59 2009
@@ -715,8 +715,10 @@
 	const char *transferer_real_context;
 	char xferto[256];
 	int res;
+	const char *orig_chan_name;
 
 	set_peers(&transferer, &transferee, peer, chan, sense);
+	orig_chan_name = ast_strdupa(transferer->name);
 	transferer_real_context = real_ctx(transferer, transferee);
 	/* Start autoservice on chan while we talk to the originator */
 	ast_autoservice_start(transferee);
@@ -743,7 +745,7 @@
 		res = finishup(transferee);
 		if (res)
 			res = -1;
-		else if (!masq_park_call_announce(transferee, transferer, 0, NULL, NULL)) {	/* success */
+		else if (!masq_park_call_announce(transferee, transferer, 0, NULL, orig_chan_name)) {	/* success */
 			/* We return non-zero, but tell the PBX not to hang the channel when
 			   the thread dies -- We have to be careful now though.  We are responsible for 
 			   hanging up the channel, else it will never be hung up! */