kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

search in the current context for 'a' and 'o' instead of 'default'

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@327890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2011-07-12 20:07:20 +00:00
parent a971479967
commit 3769e99537
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/app_directory.c
View File

@@ -57,7 +57,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<parameter name="dial-context" required="false"> <parameter name="dial-context" required="false">
<para>This is the dialplan context to use when looking for an <para>This is the dialplan context to use when looking for an
extension that the user has selected, or when jumping to the extension that the user has selected, or when jumping to the
<literal>o</literal> or <literal>a</literal> extension.</para> <literal>o</literal> or <literal>a</literal> extension. If not
specified, the current context will be used.</para>
</parameter> </parameter>
<parameter name="options" required="false"> <parameter name="options" required="false">
<optionlist> <optionlist>
@@ -246,7 +247,7 @@ static int compare(const char *text, const char *template)
static int goto_exten(struct ast_channel *chan, const char *dialcontext, char *ext) static int goto_exten(struct ast_channel *chan, const char *dialcontext, char *ext)
{ {
if (!ast_goto_if_exists(chan, dialcontext, ext, 1) || if (!ast_goto_if_exists(chan, S_OR(dialcontext, chan->context), ext, 1) ||
(!ast_strlen_zero(chan->macrocontext) && (!ast_strlen_zero(chan->macrocontext) &&
!ast_goto_if_exists(chan, chan->macrocontext, ext, 1))) { !ast_goto_if_exists(chan, chan->macrocontext, ext, 1))) {
return 0; return 0;
@@ -685,11 +686,11 @@ static int do_directory(struct ast_channel *chan, struct ast_config *vmcfg, stru
int count, i; int count, i;
char ext[10] = ""; char ext[10] = "";
if (digit == '0' && !goto_exten(chan, S_OR(dialcontext, "default"), "o")) { if (digit == '0' && !goto_exten(chan, dialcontext, "o")) {
return digit; return digit;
} }
if (digit == '*' && !goto_exten(chan, S_OR(dialcontext, "default"), "a")) { if (digit == '*' && !goto_exten(chan, dialcontext, "a")) {
return digit; return digit;
} }