From 5bd40f4e11457985d268cd7e19bed0c9368a35c3 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Thu, 15 Sep 2005 00:56:09 +0000
Subject: [PATCH] revert a portion of issue #5138 which broke this app (issue
#5232)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6609 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_directory.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/apps/app_directory.c b/apps/app_directory.c
index 4344c85c2a..39b7488c6c 100755
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -300,8 +300,11 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char *
return -1;
}
if (digit == '0') {
- if (ast_goto_if_exists(chan, chan->context, "o", 1) ||
- (!ast_strlen_zero(chan->macrocontext) && ast_goto_if_exists(chan, chan->macrocontext, "o", 1))) {
+ if (ast_exists_extension(chan,chan->context,"o",1,chan->cid.cid_num) ||
+ (!ast_strlen_zero(chan->macrocontext) &&
+ ast_exists_extension(chan, chan->macrocontext, "o", 1, chan->cid.cid_num))) {
+ strcpy(chan->exten, "o");
+ chan->priority = 0;
return 0;
} else {
@@ -311,8 +314,11 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char *
}
}
if (digit == '*') {
- if (ast_goto_if_exists(chan, chan->context, "a", 1) ||
- (!ast_strlen_zero(chan->macrocontext) && ast_goto_if_exists(chan, chan->macrocontext, "a", 1))) {
+ if (ast_exists_extension(chan,chan->context,"a",1,chan->cid.cid_num) ||
+ (!ast_strlen_zero(chan->macrocontext) &&
+ ast_exists_extension(chan, chan->macrocontext, "a", 1, chan->cid.cid_num))) {
+ strcpy(chan->exten, "a");
+ chan->priority = 0;
return 0;
} else {
ast_log(LOG_WARNING, "Can't find extension 'a' in current context. "
--
GitLab