kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tilghman's app/appdata in newexten patch (bug #2104)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-07-24 02:26:07 +00:00
parent a1531e0ae3
commit d3499da6fd
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pbx.c
View File

@@ -1259,6 +1259,15 @@ static int pbx_extension_helper(struct ast_channel *c, char *context, char *exte
term_color(tmp2, c->name, COLOR_BRMAGENTA, 0, sizeof(tmp2)), term_color(tmp2, c->name, COLOR_BRMAGENTA, 0, sizeof(tmp2)),
term_color(tmp3, (!ast_strlen_zero(passdata) ? (char *)passdata : ""), COLOR_BRMAGENTA, 0, sizeof(tmp3)), term_color(tmp3, (!ast_strlen_zero(passdata) ? (char *)passdata : ""), COLOR_BRMAGENTA, 0, sizeof(tmp3)),
(newstack ? "in new stack" : "in same stack")); (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); res = pbx_exec(c, app, passdata, newstack);
return res; return res;
} else { } else {
@@ -1795,13 +1804,6 @@ int ast_pbx_run(struct ast_channel *c)
digit = 0; digit = 0;
while(ast_exists_extension(c, c->context, c->exten, c->priority, c->callerid)) { while(ast_exists_extension(c, c->context, c->exten, c->priority, c->callerid)) {
memset(exten, 0, sizeof(exten)); 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))) { if ((res = ast_spawn_extension(c, c->context, c->exten, c->priority, c->callerid))) {
/* Something bad happened, or a hangup has been requested. */ /* Something bad happened, or a hangup has been requested. */
if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F')) || if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F')) ||