[svn-commits] murf: branch murf/bug8423-1.4 r48243 - /team/murf/bug8423-1.4/main/manager.c

[svn-commits at lists.digium.com]

Author: murf
Date: Mon Dec  4 14:26:46 2006
New Revision: 48243

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48243
Log:
patch is incorporated -- ready to commit?

Modified:
    team/murf/bug8423-1.4/main/manager.c

Modified: team/murf/bug8423-1.4/main/manager.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/main/manager.c?view=diff&rev=48243&r1=48242&r2=48243
==============================================================================
--- team/murf/bug8423-1.4/main/manager.c (original)
+++ team/murf/bug8423-1.4/main/manager.c Mon Dec  4 14:26:46 2006
@@ -1567,6 +1567,7 @@
 	int res;
 	int reason = 0;
 	struct ast_channel *chan = NULL;
+	char requested_channel[AST_CHANNEL_NAME];
 
 	if (!ast_strlen_zero(in->app)) {
 		res = ast_pbx_outgoing_app(in->tech, AST_FORMAT_SLINEAR, in->data, in->timeout, in->app, in->appdata, &reason, 1, 
@@ -1578,13 +1579,15 @@
 			S_OR(in->cid_num, NULL), 
 			S_OR(in->cid_name, NULL),
 			in->vars, in->account, &chan);
-	}   
-	
+	}
+
+	if (!chan)
+		snprintf(requested_channel, AST_CHANNEL_NAME, "%s/%s", in->tech, in->data);	
 	/* Tell the manager what happened with the channel */
 	manager_event(EVENT_FLAG_CALL,
 		res ? "OriginateFailure" : "OriginateSuccess",
 		"%s"
-		"Channel: %s/%s\r\n"
+		"Channel: %s\r\n"
 		"Context: %s\r\n"
 		"Exten: %s\r\n"
 		"Reason: %d\r\n"
@@ -1592,7 +1595,7 @@
 		"CallerID: %s\r\n"		/* This parameter is deprecated and will be removed post-1.4 */
 		"CallerIDNum: %s\r\n"
 		"CallerIDName: %s\r\n",
-		in->idtext, in->tech, in->data, in->context, in->exten, reason, 
+		in->idtext, chan ? chan->name : requested_channel, in->context, in->exten, reason, 
 		chan ? chan->uniqueid : "<null>",
 		S_OR(in->cid_num, "<unknown>"),
 		S_OR(in->cid_num, "<unknown>"),