kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 79255 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79255 | murf | 2007-08-13 11:49:54 -0600 (Mon, 13 Aug 2007) | 1 line

This patch fixes bug 10411. I added a new regression test, some regression test cleanups
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Steve Murphy
2007-08-14 14:32:21 +00:00
parent 9264d5007a
commit d9b52497f0
17 changed files with 1984 additions and 1909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pbx/pbx_ael.c
View File

@@ -3697,15 +3697,18 @@ void add_extensions(struct ael_extension *exten)
{
struct ael_priority *pr;
char *label=0;
char realext[AST_MAX_EXTENSION];
if (!exten) {
ast_log(LOG_WARNING, "This file is Empty!\n" );
return;
}
do {
struct ael_priority *last = 0;
memset(realext, '\0', sizeof(realext)); /* make sure this is properly initialized */
pbx_substitute_variables_helper(NULL, exten->name, realext, sizeof(realext) - 1);
if (exten->hints) {
if (ast_add_extension2(exten->context, 0 /*no replace*/, exten->name, PRIORITY_HINT, NULL, exten->cidmatch,
if (ast_add_extension2(exten->context, 0 /*no replace*/, realext, PRIORITY_HINT, NULL, exten->cidmatch,
exten->hints, NULL, ast_free, registrar)) {
ast_log(LOG_WARNING, "Unable to add step at priority 'hint' of extension '%s'\n",
exten->name);
@@ -3785,7 +3788,7 @@ void add_extensions(struct ael_extension *exten)
else
label = 0;
if (ast_add_extension2(exten->context, 0 /*no replace*/, exten->name, pr->priority_num, (label?label:NULL), exten->cidmatch,
if (ast_add_extension2(exten->context, 0 /*no replace*/, realext, pr->priority_num, (label?label:NULL), exten->cidmatch,
app, strdup(appargs), ast_free, registrar)) {
ast_log(LOG_WARNING, "Unable to add step at priority '%d' of extension '%s'\n", pr->priority_num,
exten->name);
@@ -3885,6 +3888,22 @@ void ast_compile_ael2(struct ast_context **local_contexts, struct pval *root)
struct ael_extension *exten;
struct ael_extension *exten_list = 0;
for (p=root; p; p=p->next ) { /* do the globals first, so they'll be there
when we try to eval them */
switch (p->type) {
case PV_GLOBALS:
/* just VARDEC elements */
for (p2=p->u1.list; p2; p2=p2->next) {
char buf2[2000];
snprintf(buf2,sizeof(buf2),"%s=%s", p2->u1.str, p2->u2.val);
pbx_builtin_setvar(NULL, buf2);
}
break;
default:
break;
}
}
for (p=root; p; p=p->next ) {
pval *lp;
int argc;
@@ -3948,12 +3967,7 @@ void ast_compile_ael2(struct ast_context **local_contexts, struct pval *root)
break;
case PV_GLOBALS:
/* just VARDEC elements */
for (p2=p->u1.list; p2; p2=p2->next) {
char buf2[2000];
snprintf(buf2,sizeof(buf2),"%s=%s", p2->u1.str, p2->u2.val);
pbx_builtin_setvar(NULL, buf2);
}
/* already done */
break;
case PV_CONTEXT: