path: root/apps/app_read.c
diff options
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-02-17 20:41:24 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-02-17 20:41:24 +0000
commit1f57cd4e5150eb916b30f5183deb3449a0d6795d (patch)
tree106de0147974e2e7f7c18dec2d603d9060afebc2 /apps/app_read.c
parent2a22b3a479a4d109af680c80cbad31831fe28af5 (diff)
Merge a large set of updates to the Asterisk indications API.
This patch includes a number of changes to the indications API. The primary motivation for this work was to improve stability. The object management in this API was significantly flawed, and a number of trivial situations could cause crashes. The changes included are: 1) Remove the module res_indications. This included the critical functionality that actually loaded the indications configuration. I have seen many people have Asterisk problems because they accidentally did not have an indications.conf present and loaded. Now, this code is in the core, and Asterisk will fail to start without indications configuration. There was one part of res_indications, the dialplan applications, which did belong in a module, and have been moved to a new module, app_playtones. 2) Object management has been significantly changed. Tone zones are now managed using astobj2, and it is no longer possible to crash Asterisk by issuing a reload that destroys tone zones while they are in use. 3) The API documentation has been filled out. 4) The API has been updated to follow our naming conventions. 5) Various bits of code throughout the tree have been updated to account for the API update. 6) Configuration parsing has been mostly re-written. 7) "Code cleanup" The code is from svn/asterisk/team/russell/indications/. Review: http://reviewboard.digium.com/r/149/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@176627 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_read.c')
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/app_read.c b/apps/app_read.c
index 6fb00b779..6b4088cb7 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -132,7 +132,7 @@ static int read_exec(struct ast_channel *chan, void *data)
int tries = 1, to = 0, x = 0;
double tosec;
char *argcopy = NULL;
- struct tone_zone_sound *ts = NULL;
+ struct ast_tone_zone_sound *ts = NULL;
struct ast_flags flags = {0};
const char *status = "ERROR";
@@ -188,7 +188,7 @@ static int read_exec(struct ast_channel *chan, void *data)
return 0;
if (ast_test_flag(&flags, OPT_INDICATION)) {
- if (! ast_strlen_zero(arglist.filename)) {
+ if (!ast_strlen_zero(arglist.filename)) {
ts = ast_get_indication_tone(chan->zone, arglist.filename);
@@ -258,6 +258,10 @@ static int read_exec(struct ast_channel *chan, void *data)
+ if (ts) {
+ ts = ast_tone_zone_sound_unref(ts);
+ }
if (ast_check_hangup(chan))
status = "HANGUP";
pbx_builtin_setvar_helper(chan, "READSTATUS", status);