From 9e7de73fee610939df702a9f4a4a24a6693fb239 Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Mon, 7 May 2012 18:42:48 +0000 Subject: [PATCH] Support VoiceMail d() option when extension does not exist in channel's context The VoiceMail d([c]) option is documented to accept digits for a new extension in context , if played during the greeting. This option works fine if the extension being redirected to has an extension with the same initial digit in the channel's current context. If that digit did not happen to exist in some extension, a dialplan match would fail and the user would not be redirected. This patch fixes it such that if the option is used, the extensions are matched in that context as opposed to the caller's original context. (closes issue ASTERISK-18243) Reported by: mjordan Tested by: mjordan Review: https://reviewboard.asterisk.org/r/1892 ........ Merged revisions 365474 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 365475 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@365477 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 10 ++++++---- main/pbx.c | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 54b199a0b9..da974fcfc4 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -5834,8 +5834,9 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ char e[2] = ""; e[0] = *code; if (strchr(ecodes, e[0]) == NULL - && ast_canmatch_extension(chan, ast_channel_context(chan), e, 1, - S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, NULL))) { + && ast_canmatch_extension(chan, + (!ast_strlen_zero(options->exitcontext) ? options->exitcontext : chan->context), + e, 1, S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL))) { strncat(ecodes, e, sizeof(ecodes) - strlen(ecodes) - 1); } } @@ -5927,11 +5928,12 @@ static int leave_voicemail(struct ast_channel *chan, char *ext, struct leave_vm_ /* Allow all other digits to exit Voicemail and return to the dialplan */ if (ast_test_flag(options, OPT_DTMFEXIT) && res > 0) { - if (!ast_strlen_zero(options->exitcontext)) + if (!ast_strlen_zero(options->exitcontext)) { ast_channel_context_set(chan, options->exitcontext); + } free_user(vmu); - pbx_builtin_setvar_helper(chan, "VMSTATUS", "USEREXIT"); ast_free(tmp); + pbx_builtin_setvar_helper(chan, "VMSTATUS", "USEREXIT"); return res; } diff --git a/main/pbx.c b/main/pbx.c index bab87c4230..75a569cd94 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5262,8 +5262,9 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, * and continue, or we can drop out entirely. */ if (invalid - || !ast_exists_extension(c, ast_channel_context(c), ast_channel_exten(c), 1, - S_COR(ast_channel_caller(c)->id.number.valid, ast_channel_caller(c)->id.number.str, NULL))) { + || (ast_strlen_zero(dst_exten) && + !ast_exists_extension(c, c->context, c->exten, 1, + S_COR(c->caller.id.number.valid, c->caller.id.number.str, NULL)))) { /*!\note * If there is no match at priority 1, it is not a valid extension anymore. * Try to continue at "i" (for invalid) or "e" (for exception) or exit if -- 2.47.3