asterisk

mirror of https://github.com/asterisk/asterisk.git synced 2026-05-06 05:13:49 +00:00

Files

David Vossel 979eb709ae 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: https://origsvn.digium.com/svn/asterisk/trunk@180032 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2009-03-03 23:21:18 +00:00

db1-ast

Merged revisions 157859 via svnmerge from

2008-11-20 00:08:12 +00:00

editline

Merged revisions 179395 via svnmerge from

2009-03-02 20:16:51 +00:00

stdtime

Picky, picky buildbots

2009-02-25 19:49:46 +00:00

abstract_jb.c

Create logfile safely.

2009-01-22 21:25:46 +00:00

acl.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

adsistub.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

aescrypt.c

use the OpenSSL AES implementation if it's available (unless configured not to)

2007-05-24 22:07:50 +00:00

aeskey.c

use the OpenSSL AES implementation if it's available (unless configured not to)

2007-05-24 22:07:50 +00:00

aesopt.h

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

aestab.c

use the OpenSSL AES implementation if it's available (unless configured not to)

2007-05-24 22:07:50 +00:00

alaw.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

app.c

app_read does not break from prompt loop with user terminated empty string

2009-03-03 23:21:18 +00:00

ast_expr2.c

Merged revisions 179807 via svnmerge from

2009-03-03 22:12:02 +00:00

ast_expr2.fl

Merged revisions 179807 via svnmerge from

2009-03-03 22:12:02 +00:00

ast_expr2.h

Merged revisions 179807 via svnmerge from

2009-03-03 22:12:02 +00:00

ast_expr2.y

Merged revisions 179807 via svnmerge from

2009-03-03 22:12:02 +00:00

ast_expr2f.c

Merged revisions 179807 via svnmerge from

2009-03-03 22:12:02 +00:00

asterisk.c

Merged revisions 178508 via svnmerge from

2009-02-25 12:45:30 +00:00

astmm.c

Janitor, use ARRAY_LEN() when possible.

2008-12-05 10:31:25 +00:00

astobj2.c

Make lock information for ao2_trylock be more useful and gnarly

2009-02-12 16:28:06 +00:00

audiohook.c

Fix issue where changing the volume of both directions of audio did not work.

2009-03-02 14:13:45 +00:00

autoservice.c

Merged revisions 163448 via svnmerge from

2008-12-12 13:55:30 +00:00

buildinfo.c

fix a few small things found by using sparse

2008-10-30 16:49:02 +00:00

callerid.c

Merged revisions 160943 via svnmerge from

2008-12-04 16:45:06 +00:00

cdr.c

Merge ast_str_opaque branch (discontinue usage of ast_str internals)

2008-12-13 08:36:35 +00:00

channel.c

app_read does not break from prompt loop with user terminated empty string

2009-03-03 23:21:18 +00:00

chanvars.c

Add additional memory debugging to several core APIs, and fix several memory

2008-10-14 22:38:06 +00:00

cli.c

Remove tabs from comment

2009-01-29 23:15:20 +00:00

config.c

If there are no realtime engines, there's no reason to check for realtime families

2009-02-17 15:18:55 +00:00

cryptostub.c

Don't include logger.h in asterisk.h by default as it is causing problems building

2008-10-10 00:42:13 +00:00

cygload.c

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

datastore.c

make datastore creation and destruction a generic API since it is not really channel related, and add the ability to add/find/remove datastores to manager sessions

2008-08-05 16:56:11 +00:00

db.c

Merged revisions 167299 via svnmerge from

2009-01-06 21:36:44 +00:00

devicestate.c

Slightly optimize ast_devstate_str and rename global functions devstate2str and config_text_file_save to have an ast_ prefix

2008-11-04 18:47:20 +00:00

dial.c

* Fixed timeout logic in the dialing API as setting timeouts

2008-10-31 20:05:46 +00:00

dns.c

incorporates r159808 from branches/1.4:

2008-11-29 17:57:39 +00:00

dnsmgr.c

Record the previous port in the temporary address structure so that the comparison does not treat the host as having changed even if it did not. This would have been uninitialized before and would have led to a baddddd port.

2008-12-22 16:08:13 +00:00

dsp.c

Add an option, waitfordialtone, for UK analog lines which do not end a call

2008-11-25 22:45:59 +00:00

ecdisa.h

merge new_loader_completion branch, including (at least):

2006-08-21 02:11:39 +00:00

enum.c

Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating

2008-09-12 23:30:03 +00:00

event.c

incorporates r159808 from branches/1.4:

2008-11-29 17:57:39 +00:00

features.c

Merged revisions 179840 via svnmerge from

2009-03-03 18:28:46 +00:00

file.c

Fix an issue where the timer for file playback would not be stopped if DAHDI was not installed.

2009-02-26 16:42:36 +00:00

fixedjitterbuf.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

fixedjitterbuf.h

Merged revisions 135841,135847,135850 via svnmerge from

2008-08-06 00:30:53 +00:00

frame.c

fix two very minor bugs: if anyone ever uses SLINEAR16 as a format in RTP, ensure that the samples are byte-swapped to network order if needed. also, when a smoother is operating on a format that has a sample rate other than 8000 samples per second, use the proper sample rate for computing delivery timestamps.

2009-02-18 23:09:58 +00:00

fskmodem_float.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem_int.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem.c

(Step 2 of 2)

2008-07-21 21:00:47 +00:00

global_datastores.c

Merged revisions 172517 via svnmerge from

2009-01-30 21:29:12 +00:00

hashtab.c

Trailing whitespace, minor coding guideline fixes, and start beefing up the

2009-02-21 14:16:44 +00:00

heap.c

Add an implementation of the heap data structure.

2009-02-17 20:51:10 +00:00

http.c

Fix qualify for TCP peer

2009-01-17 01:56:36 +00:00

image.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

indications.c

Ensure there is a valid tone part before trying to play tones.

2009-02-26 15:40:10 +00:00

io.c

Merged revisions 94977 via svnmerge from

2007-12-27 20:11:20 +00:00

jitterbuf.c

Merged revisions 174583 via svnmerge from

2009-02-10 18:16:31 +00:00

loader.c

Merge a large set of updates to the Asterisk indications API.

2009-02-17 20:41:24 +00:00

logger.c

Assist proper thread synchronization when stopping the logger thread.

2009-02-16 18:25:57 +00:00

Makefile

Merged revisions 177540 via svnmerge from

2009-02-19 23:56:50 +00:00

manager.c

Fix an fd leak that would occur in HTTP AMI sessions

2009-02-10 21:45:14 +00:00

md5.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

netsock.c

Make OpenBSD compile again

2008-06-19 20:25:37 +00:00

pbx.c

Merged revisions 177786 via svnmerge from

2009-02-20 23:02:35 +00:00

plc.c

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

poll.c

Merged revisions 140816 via svnmerge from

2008-09-03 13:26:43 +00:00

privacy.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

rtp.c

Merged revisions 178373 via svnmerge from

2009-02-24 20:39:57 +00:00

say.c

Fix a crash when saying certain numbers in Chinese

2009-01-21 22:10:02 +00:00

sched.c

Fix a regression in scheduler entry ordering, and add a regression test for it.

2009-02-23 17:29:16 +00:00

sha1.c

more header removal/normalization

2007-11-21 00:23:49 +00:00

slinfactory.c

improve slinfactory API to remove implicit sample rate and require explicit sample rate selection by creator of the slinfactory

2009-02-10 19:38:26 +00:00

srv.c

bump the verbosity of a message in srv.c up by one. It used to be

2009-01-12 23:12:30 +00:00

strcompat.c

Whitespace changes only

2008-03-04 23:04:29 +00:00

strings.c

Handle negative length and eliminate a condition that is always true.

2009-02-18 23:51:35 +00:00

taskprocessor.c

correct a CLI description

2009-01-13 16:02:13 +00:00

tcptls.c

When using a socket as a FILE *, the stdio functions will sometimes try to do

2009-02-04 18:48:06 +00:00

tdd.c

Don't include logger.h in asterisk.h by default as it is causing problems building

2008-10-10 00:42:13 +00:00

term.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

threadstorage.c

Merged revisions 164736 via svnmerge from

2008-12-16 17:14:01 +00:00

timing.c

Update the timing API to have better support for multiple timing interfaces.

2009-02-17 21:22:40 +00:00

translate.c

Merge ast_str_opaque branch (discontinue usage of ast_str internals)

2008-12-13 08:36:35 +00:00

udptl.c

Merged revisions 175311 via svnmerge from

2009-02-12 21:25:14 +00:00

ulaw.c

another bunch of include removals (errno.h and asterisk/logger.h)

2007-11-19 19:09:03 +00:00

utils.c

Fixed error where a check for an zero length, terminated string was needed.

2009-02-18 17:24:07 +00:00

xml.c

1. Make OS X compile cleanly with app_stack.

2009-02-03 00:29:49 +00:00

xmldoc.c

Don't forget to free typename

2008-12-31 22:53:55 +00:00