[asterisk-commits] murf: branch 1.4 r48349 - in /branches/1.4: CHANGES UPGRADE.txt main/manager.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Thu Dec  7 09:33:32 2006
New Revision: 48349

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48349
Log:
Here lies the fixes that killed bug 8423 -- OriginateSuccess and OriginateError incomplete channel name. May it rest in peace.

Modified:
    branches/1.4/CHANGES
    branches/1.4/UPGRADE.txt
    branches/1.4/main/manager.c

Modified: branches/1.4/CHANGES
URL: http://svn.digium.com/view/asterisk/branches/1.4/CHANGES?view=diff&rev=48349&r1=48348&r2=48349
==============================================================================
--- branches/1.4/CHANGES (original)
+++ branches/1.4/CHANGES Thu Dec  7 09:33:32 2006
@@ -337,3 +337,5 @@
          2. chan_modem_* and related modules are gone because the kernel support for those interfaces is old, buggy and unsupported
     * New Utils:
          1. aelparse -- compile .ael files outside of asterisk
+    * New manager events:
+         1. OriginateResponse event comes to replace OriginateSuccess and OriginateFailure

Modified: branches/1.4/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/branches/1.4/UPGRADE.txt?view=diff&rev=48349&r1=48348&r2=48349
==============================================================================
--- branches/1.4/UPGRADE.txt (original)
+++ branches/1.4/UPGRADE.txt Thu Dec  7 09:33:32 2006
@@ -247,6 +247,10 @@
   also been deprecated in favor of the already existing MeetmeTalking event
   with a "Status" of "on" or "off" added.
 
+* OriginateFailure and OriginateSuccess events were replaced by event
+  OriginateResponse with a header named "Response" to indicate success or
+  failure
+
 Variables:
 
 * The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},

Modified: branches/1.4/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/manager.c?view=diff&rev=48349&r1=48348&r2=48349
==============================================================================
--- branches/1.4/main/manager.c (original)
+++ branches/1.4/main/manager.c Thu Dec  7 09:33:32 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",
+	manager_event(EVENT_FLAG_CALL, "OriginateResponse",
 		"%s"
-		"Channel: %s/%s\r\n"
+		"Response: %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, res ? "Failure" : "Success", 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>"),