[Asterisk-cvs] asterisk pbx.c,1.139,1.140

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory localhost.localdomain:/tmp/cvs-serv8551

Modified Files:
	pbx.c 
Log Message:
Merge tilghman's app/appdata in newexten patch (bug #2104)


Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- pbx.c	19 Jul 2004 00:30:39 -0000	1.139
+++ pbx.c	24 Jul 2004 02:26:07 -0000	1.140
@@ -1259,6 +1259,15 @@
 								term_color(tmp2, c->name, COLOR_BRMAGENTA, 0, sizeof(tmp2)),
 								term_color(tmp3, (!ast_strlen_zero(passdata) ? (char *)passdata : ""), COLOR_BRMAGENTA, 0, sizeof(tmp3)),
 								(newstack ? "in new stack" : "in same stack"));
+				manager_event(EVENT_FLAG_CALL, "Newexten", 
+					"Channel: %s\r\n"
+					"Context: %s\r\n"
+					"Extension: %s\r\n"
+					"Priority: %d\r\n"
+					"Application: %s\r\n"
+					"AppData: %s\r\n"
+					"Uniqueid: %s\r\n",
+					c->name, c->context, c->exten, c->priority, app->name, passdata ? passdata : "(NULL)", c->uniqueid);
 				res = pbx_exec(c, app, passdata, newstack);
 				return res;
 			} else {
@@ -1795,13 +1804,6 @@
 		digit = 0;
 		while(ast_exists_extension(c, c->context, c->exten, c->priority, c->callerid)) {
 			memset(exten, 0, sizeof(exten));
-			manager_event(EVENT_FLAG_CALL, "Newexten", 
-				"Channel: %s\r\n"
-				"Context: %s\r\n"
-				"Extension: %s\r\n"
-				"Priority: %d\r\n"
-				"Uniqueid: %s\r\n",
-				c->name, c->context, c->exten, c->priority, c->uniqueid);
 			if ((res = ast_spawn_extension(c, c->context, c->exten, c->priority, c->callerid))) {
 				/* Something bad happened, or a hangup has been requested. */
 				if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F')) ||