diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 23:35:18 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 23:35:18 +0000 |
| commit | 410e3b05bb72a98104cb3b15b5f6354eca84f578 (patch) | |
| tree | 29c64df6b69cd4caa781ea652375704d22cb56c3 /apps | |
| parent | 5d81fa4632200e814e7374e5f05460fcfeafc38a (diff) | |
Merged revisions 180032 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r180032 | dvossel | 2009-03-03 17:21:18 -0600 (Tue, 03 Mar 2009) | 14 lines
app_read does not break from prompt loop with user terminated empty string
In app.c, ast_app_getdata is called to stream the prompts and receive DTMF input. If ast_app_getdata() receives an empty string caused by the user inputing the end of string character, in this case '#', it should break from the prompt loop and return to app_read, but instead it cycles through all the prompts. I've added a return value for this special case in ast_readstring() which uses an enum I've delcared in apps.h. This enum is now used as a return value for ast_app_getdata().
(closes issue #14279)
Reported by: Marquis
Patches:
fix_app_read.patch uploaded by Marquis (license 32)
read-ampersanmd.patch2 uploaded by dvossel (license 671)
Tested by: Marquis, dvossel
Review: http://reviewboard.digium.com/r/177/
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@180078 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_read.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_read.c b/apps/app_read.c index 710bdd4ba..e23b48670 100644 --- a/apps/app_read.c +++ b/apps/app_read.c @@ -185,11 +185,11 @@ static int read_exec(struct ast_channel *chan, void *data) } } else { res = ast_app_getdata(chan, arglist.filename, tmp, maxdigits, to); - if (res == 0) + if (res == AST_GETDATA_COMPLETE || res == AST_GETDATA_EMPTY_END_TERMINATED) status = "OK"; - else if (res == 1) + else if (res == AST_GETDATA_TIMEOUT) status = "TIMEOUT"; - else if (res == 2) + else if (res == AST_GETDATA_INTERRUPTED) status = "INTERRUPTED"; } if (res > -1) { |