[asterisk-commits] murf: branch murf/bug8423-1.4 r48340 - in /team/murf/bug8423-1.4: ./ main/

[asterisk-commits at lists.digium.com]

Author: murf
Date: Wed Dec  6 16:34:50 2006
New Revision: 48340

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48340
Log:
Unify OriginateSuccess, OriginateFailure into a single manager event with a success,fail type subheader, to follow specifications

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

Modified: team/murf/bug8423-1.4/CHANGES
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/CHANGES?view=diff&rev=48340&r1=48339&r2=48340
==============================================================================
--- team/murf/bug8423-1.4/CHANGES (original)
+++ team/murf/bug8423-1.4/CHANGES Wed Dec  6 16:34:50 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: team/murf/bug8423-1.4/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/murf/bug8423-1.4/UPGRADE.txt?view=diff&rev=48340&r1=48339&r2=48340
==============================================================================
--- team/murf/bug8423-1.4/UPGRADE.txt (original)
+++ team/murf/bug8423-1.4/UPGRADE.txt Wed Dec  6 16:34:50 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: 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=48340&r1=48339&r2=48340
==============================================================================
--- team/murf/bug8423-1.4/main/manager.c (original)
+++ team/murf/bug8423-1.4/main/manager.c Wed Dec  6 16:34:50 2006
@@ -1584,9 +1584,9 @@
 	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"
+		"Response: %s\r\n"
 		"Channel: %s\r\n"
 		"Context: %s\r\n"
 		"Exten: %s\r\n"
@@ -1595,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, chan ? chan->name : requested_channel, 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>"),