kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copyright clarification; also, have variable set to "t" or "i" on timeout or

Browse Source 
invalid extension, respectively.
(closes issue #13944)
 Reported by: chappell


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@159054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-11-25 05:19:53 +00:00
parent ac296a4ad3
commit 807566899a
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/app_readexten.c
View File

@@ -1,9 +1,8 @@
/* /*
* Asterisk -- An open source telephony toolkit. * Asterisk -- An open source telephony toolkit.
* *
* Copyright (C) 2007 Dave Chappell * Copyright (C) 2007-2008, Trinity College Computing Center
* * Written by David Chappell <David.Chappell@trincoll.edu>
* David Chappell <David.Chappell@trincoll.edu>
* *
* See http://www.asterisk.org for more information about * See http://www.asterisk.org for more information about
* the Asterisk project. Please do not directly contact * the Asterisk project. Please do not directly contact
@@ -77,10 +76,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
A valid extension exists in ${variable}. A valid extension exists in ${variable}.
</value> </value>
<value name="TIMEOUT"> <value name="TIMEOUT">
No extension was entered in the specified time. No extension was entered in the specified time. Also sets ${variable} to "t".
</value> </value>
<value name="INVALID"> <value name="INVALID">
An invalid extension, ${INVALID_EXTEN}, was entered. An invalid extension, ${INVALID_EXTEN}, was entered. Also sets ${variable} to "i".
</value> </value>
<value name="SKIP"> <value name="SKIP">
Line was not up and the option 's' was specified. Line was not up and the option 's' was specified.
@@ -154,7 +153,7 @@ static int readexten_exec(struct ast_channel *chan, void *data)
AST_STANDARD_APP_ARGS(arglist, argcopy); AST_STANDARD_APP_ARGS(arglist, argcopy);
if (ast_strlen_zero(arglist.variable)) { if (ast_strlen_zero(arglist.variable)) {
ast_log(LOG_WARNING, "Invalid! Usage: ReadExten(variable[|filename][|context][|options][|timeout])\n\n"); ast_log(LOG_WARNING, "Usage: ReadExten(variable[,filename[,context[,options[,timeout]]]])\n");
pbx_builtin_setvar_helper(chan, "READEXTENSTATUS", "ERROR"); pbx_builtin_setvar_helper(chan, "READEXTENSTATUS", "ERROR");
return 0; return 0;
} }
@@ -218,10 +217,12 @@ static int readexten_exec(struct ast_channel *chan, void *data)
timeout = digit_timeout; timeout = digit_timeout;
if (res < 1) { /* timeout expired or hangup */ if (res < 1) { /* timeout expired or hangup */
if (ast_check_hangup(chan)) if (ast_check_hangup(chan)) {
status = "HANGUP"; status = "HANGUP";
else } else {
pbx_builtin_setvar_helper(chan, arglist.variable, "t");
status = "TIMEOUT"; status = "TIMEOUT";
}
break; break;
} else if (res == '#') { } else if (res == '#') {
break; break;
@@ -242,6 +243,7 @@ static int readexten_exec(struct ast_channel *chan, void *data)
status = "OK"; status = "OK";
} else { } else {
ast_debug(3, "User dialed invalid extension '%s' in context '%s' on %s\n", exten, arglist.context, chan->name); ast_debug(3, "User dialed invalid extension '%s' in context '%s' on %s\n", exten, arglist.context, chan->name);
pbx_builtin_setvar_helper(chan, arglist.variable, "i");
pbx_builtin_setvar_helper(chan, "INVALID_EXTEN", exten); pbx_builtin_setvar_helper(chan, "INVALID_EXTEN", exten);
status = "INVALID"; status = "INVALID";
} }