diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-05 21:30:18 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-05 21:30:18 +0000 |
| commit | 6f3b1c60409793ddb17804110beab59d94c49866 (patch) | |
| tree | e7f481c7215f52601d34d62c01f389a861c77032 /pbx/pbx_ael.c | |
| parent | 9b9e41c461f34f7bf4adc3f4ec2edba38e77cc69 (diff) | |
this fixes bug 9883, wherein macros were not allowing the includes construct. fixed and tested, looks OK. Now includes can serve as an adjunct to catch.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@67526 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/pbx_ael.c')
| -rw-r--r-- | pbx/pbx_ael.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c index eda306261..7ccc5e82d 100644 --- a/pbx/pbx_ael.c +++ b/pbx/pbx_ael.c @@ -3780,7 +3780,29 @@ void ast_compile_ael2(struct ast_context **local_contexts, struct pval *root) np2->appargs = strdup(buf); linkprio(exten, np2); } - + /* add any includes */ + for (p2=p->u3.macro_statements; p2; p2=p2->next) { + pval *p3; + + switch (p2->type) { + case PV_INCLUDES: + for (p3 = p2->u1.list; p3 ;p3=p3->next) { + if ( p3->u2.arglist ) { + snprintf(buf,sizeof(buf), "%s|%s|%s|%s|%s", + p3->u1.str, + p3->u2.arglist->u1.str, + p3->u2.arglist->next->u1.str, + p3->u2.arglist->next->next->u1.str, + p3->u2.arglist->next->next->next->u1.str); + ast_context_add_include2(context, buf, registrar); + } else + ast_context_add_include2(context, p3->u1.str, registrar); + } + break; + default: + break; + } + } /* CONTAINS APPCALLS, CATCH, just like extensions... */ gen_prios(exten, p->u1.str, p->u3.macro_statements, 0, context ); if (exten->return_needed) { |