[asterisk-commits] oej: branch oej/moremanager r88507 - /team/oej/moremanager/res/res_features.c

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Nov  5 06:59:58 2007
New Revision: 88507

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88507
Log:
Reset res_features after merge failure... Hope this is right.
Feel a bit rusty... :-)

Modified:
    team/oej/moremanager/res/res_features.c

Modified: team/oej/moremanager/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/res/res_features.c?view=diff&rev=88507&r1=88506&r2=88507
==============================================================================
--- team/oej/moremanager/res/res_features.c (original)
+++ team/oej/moremanager/res/res_features.c Mon Nov  5 06:59:58 2007
@@ -698,19 +698,21 @@
 			ast_cdr_setdestchan(transferer->cdr, transferee->name);
 			ast_cdr_setapp(transferer->cdr, "BLINDTRANSFER","");
 		}
-		if (!transferee->pbx)
-			else  {
-				manager_event(EVENT_FLAG_CALL, "Transfer", "TransferMethod: PBX\r\nTransferType: Blind\r\nChannel: %s\r\nUniqueid: %s\r\nTargetChannel: %s\r\nTargetUniqueid: %s\r\nTransferExten: %s\r\nTransferContext: %s\r\n",
-					transferer->name, transferer->uniqueid, transferee->name, transferee->uniqueid, xferto, transferer_real_context);
-			}
+		if (!transferee->pbx) {
+			/* Doh!  Use our handy async_goto functions */
+			if (option_verbose > 2) 
+				ast_verbose(VERBOSE_PREFIX_3 "Transferring %s to '%s' (context %s) priority 1\n"
+								,transferee->name, xferto, transferer_real_context);
+			if (ast_async_goto(transferee, transferer_real_context, xferto, 1))
+				ast_log(LOG_WARNING, "Async goto failed :-(\n");
 			res = -1;
-		
-		if (option_verbose > 2) 
-			ast_verbose(VERBOSE_PREFIX_3 "Transferring %s to '%s' (context %s) priority 1\n"
-				    ,transferee->name, xferto, transferer_real_context);
-		if (ast_async_goto(transferee, transferer_real_context, xferto, 1))
-			ast_log(LOG_WARNING, "Async goto failed :-(\n");
+		} else {
+			/* Set the channel's new extension, since it exists, using transferer context */
+			set_c_e_p(transferee, transferer_real_context, xferto, 0);
+		}
 		check_goto_on_transfer(transferer);
+		manager_event(EVENT_FLAG_CALL, "Transfer", "TransferMethod: PBX\r\nTransferType: Blind\r\nChannel: %s\r\nUniqueid: %s\r\nTargetChannel: %s\r\nTargetUniqueid: %s\r\nTransferExten: %s\r\nTransferContext: %s\r\n",
+		 	transferer->name, transferer->uniqueid, transferee->name, transferee->uniqueid, xferto, transferer_real_context);
 		return res;
 	} else {
 		if (option_verbose > 2)