diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-17 17:24:38 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-17 17:24:38 +0000 |
| commit | 3be0f71a01f363788e15e8bdf92e0900d8cce95c (patch) | |
| tree | bf3ff9c7704d051f35c2784de81e42cf423f62f6 /main | |
| parent | 36dadf89082dc673871e288526c8915ec995560a (diff) | |
Merged revisions 235422 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r235422 | tilghman | 2009-12-17 11:19:08 -0600 (Thu, 17 Dec 2009) | 15 lines
Merged revisions 235421 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r235421 | tilghman | 2009-12-17 11:17:51 -0600 (Thu, 17 Dec 2009) | 8 lines
Use context from which Macro is executed, not macro context, if applicable.
Also, ensure that the extension COULD match, not just that it won't match more.
(closes issue #16113)
Reported by: OrNix
Patches:
20091216__issue16113.diff.txt uploaded by tilghman (license 14)
Tested by: OrNix
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@235424 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/main/pbx.c b/main/pbx.c index be1cb5355..5e16d6319 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -8238,8 +8238,16 @@ static int pbx_builtin_background(struct ast_channel *chan, void *data) if (ast_strlen_zero(args.lang)) args.lang = (char *)chan->language; /* XXX this is const */ - if (ast_strlen_zero(args.context)) - args.context = chan->context; + if (ast_strlen_zero(args.context)) { + const char *context; + ast_channel_lock(chan); + if ((context = pbx_builtin_getvar_helper(chan, "MACRO_CONTEXT"))) { + args.context = ast_strdupa(context); + } else { + args.context = chan->context; + } + ast_channel_unlock(chan); + } if (args.options) { if (!strcasecmp(args.options, "skip")) @@ -8297,7 +8305,9 @@ static int pbx_builtin_background(struct ast_channel *chan, void *data) * gone immediately to the "i" extension, but will now need to wait for a * timeout. */ - if ((exten[0] = res) && !ast_matchmore_extension(chan, args.context, exten, 1, chan->cid.cid_num)) { + if ((exten[0] = res) && + ast_canmatch_extension(chan, args.context, exten, 1, chan->cid.cid_num) && + !ast_matchmore_extension(chan, args.context, exten, 1, chan->cid.cid_num)) { snprintf(chan->exten, sizeof(chan->exten), "%c", res); ast_copy_string(chan->context, args.context, sizeof(chan->context)); chan->priority = 0; |