From a1a592f3f05cc882dd7840f803b049d33e7682ff Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 5 Dec 2007 22:35:52 +0000 Subject: [PATCH] The 'G' option for Dial() did not properly handle the case where only a label was provided. This was due to the fact that the answering channel did not have an extension set, so ast_parseable_goto would fail. This fix eliminates the call to ast_parseable_goto on the answering channel since it is a wasteful call. The answering channel and the calling channel are both directed to the same extension and context, just different priorities, so we can just copy the values from the calling channel to the answering channel and increment the answering channel's priority. (closes issue #11382, reported by jon, patch by me with correction by jon) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@91273 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_dial.c | 6 ++++-- apps/app_voicemail.c | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/app_dial.c b/apps/app_dial.c index 4d1097e4ad..cc9722e93c 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1528,8 +1528,10 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags if (chan && peer && ast_test_flag(&opts, OPT_GOTO) && !ast_strlen_zero(opt_args[OPT_ARG_GOTO])) { replace_macro_delimiter(opt_args[OPT_ARG_GOTO]); ast_parseable_goto(chan, opt_args[OPT_ARG_GOTO]); - ast_parseable_goto(peer, opt_args[OPT_ARG_GOTO]); - peer->priority++; + /* peer goes to the same context and extension as chan, so just copy info from chan*/ + ast_copy_string(peer->context, chan->context, sizeof(peer->context)); + ast_copy_string(peer->exten, chan->exten, sizeof(peer->exten)); + peer->priority = chan->priority + 2; ast_pbx_start(peer); hanguptree(outgoing, NULL); if (continue_exec) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 76c852a99d..7b18aef3f1 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -6493,9 +6493,7 @@ static int vm_execmain(struct ast_channel *chan, void *data) /* Set language from config to override channel language */ if (!ast_strlen_zero(vmu->language)) ast_string_field_set(chan, language, vmu->language); -#ifndef IMAP_STORAGE create_dirpath(vms.curdir, sizeof(vms.curdir), vmu->context, vms.username, ""); -#endif /* Retrieve old and new message counts */ if (option_debug) ast_log(LOG_DEBUG, "Before open_mailbox\n");