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 <c>, 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 <c> 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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@365475 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 1844e4de6a281e009dc78282d580aedd22ab897f..a240f5dfa190629fbaefff2fab1dbfc86852e3e0 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -5732,8 +5732,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, chan->context, e, 1,
-                                       S_COR(chan->caller.id.number.valid, chan->caller.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);
                        }
                }
@@ -5827,11 +5828,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_copy_string(chan->context, options->exitcontext, sizeof(chan->context));
+               }
                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 cff00d2f3c86483add5715aaafb42f36c7dbc015..17f88b14ec4b209db105e26e8de84de65eee129d 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -5259,8 +5259,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, c->context, c->exten, 1,
-                               S_COR(c->caller.id.number.valid, c->caller.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