diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-10 21:33:40 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-10 21:33:40 +0000 |
| commit | 190767e44a685e3a1e5ceda3ed800cf2f8c9a53a (patch) | |
| tree | f44ad9449c69546c66e29e4ac8f2a43c8ffa646e /apps | |
| parent | 6d489e797a3a3bdf40cce9a780e4fed5aa092667 (diff) | |
Merged revisions 229351 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r229351 | tilghman | 2009-11-10 15:22:50 -0600 (Tue, 10 Nov 2009) | 7 lines
When GOSUB is invoked within an AGI, it may not exit correctly.
(closes issue #16216)
Reported by: atis
Patches:
20091110__atis_work.diff.txt uploaded by tilghman (license 14)
Tested by: atis
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@229354 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_stack.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index ef534cd7b..a70ec2aeb 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -184,6 +184,7 @@ struct gosub_stack_frame { unsigned char arguments; struct varshead varshead; int priority; + unsigned int is_agi:1; char *context; char extension[0]; }; @@ -296,6 +297,7 @@ static int return_exec(struct ast_channel *chan, void *data) struct gosub_stack_frame *oldframe; AST_LIST_HEAD(, gosub_stack_frame) *oldlist; char *retval = data; + int res = 0; if (!stack_store) { ast_log(LOG_ERROR, "Return without Gosub: stack is unallocated\n"); @@ -310,6 +312,9 @@ static int return_exec(struct ast_channel *chan, void *data) if (!oldframe) { ast_log(LOG_ERROR, "Return without Gosub: stack is empty\n"); return -1; + } else if (oldframe->is_agi) { + /* Exit from AGI */ + res = -1; } ast_explicit_goto(chan, oldframe->context, oldframe->extension, oldframe->priority); @@ -317,7 +322,7 @@ static int return_exec(struct ast_channel *chan, void *data) /* Set a return value, if any */ pbx_builtin_setvar_helper(chan, "GOSUB_RETVAL", S_OR(retval, "")); - return 0; + return res; } static int gosub_exec(struct ast_channel *chan, void *data) @@ -604,6 +609,11 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, char **arg if ((res = pbx_exec(chan, theapp, gosub_args)) == 0) { struct ast_pbx *pbx = chan->pbx; struct ast_pbx_args args; + struct ast_datastore *stack_store = ast_channel_datastore_find(chan, &stack_info, NULL); + AST_LIST_HEAD(, gosub_stack_frame) *oldlist = stack_store->data; + struct gosub_stack_frame *cur = AST_LIST_FIRST(oldlist); + cur->is_agi = 1; + memset(&args, 0, sizeof(args)); args.no_hangup_chan = 1; /* Suppress warning about PBX already existing */ |