diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-19 18:19:02 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-19 18:19:02 +0000 |
commit | 58818426d60d583c4becc6a99b398cbac1b7b12f (patch) | |
tree | 5fee3540f8d72d45cd1b2e5bf15e5860581dd4f8 /apps/app_ices.c | |
parent | a4d6ea67a7536e2cb2337527357ce6d3db8639f3 (diff) |
Massive cleanups to applications for LOCAL_USER handling and some other things.
In general, LOCAL_USER_ADD/REMOVE should be the first/last thing called in an
application. An exception is if there is some *fast* setup code that might
halt the execution of the application, such as checking to see if an argument
exists.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6832 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_ices.c')
-rwxr-xr-x | apps/app_ices.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/apps/app_ices.c b/apps/app_ices.c index 1ce63ad90..b5803738e 100755 --- a/apps/app_ices.c +++ b/apps/app_ices.c @@ -100,20 +100,24 @@ static int ices_exec(struct ast_channel *chan, void *data) struct ast_frame *f; char filename[256]=""; char *c; - last.tv_usec = 0; - last.tv_sec = 0; - if (!data || !strlen(data)) { + + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "ICES requires an argument (configfile.xml)\n"); return -1; } + + LOCAL_USER_ADD(u); + + last = ast_tv(0, 0); + if (pipe(fds)) { ast_log(LOG_WARNING, "Unable to create pipe\n"); + LOCAL_USER_REMOVE(u); return -1; } flags = fcntl(fds[1], F_GETFL); fcntl(fds[1], F_SETFL, flags | O_NONBLOCK); - LOCAL_USER_ADD(u); ast_stopstream(chan); if (chan->_state != AST_STATE_UP) @@ -123,6 +127,7 @@ static int ices_exec(struct ast_channel *chan, void *data) close(fds[0]); close(fds[1]); ast_log(LOG_WARNING, "Answer failed!\n"); + LOCAL_USER_REMOVE(u); return -1; } @@ -132,6 +137,7 @@ static int ices_exec(struct ast_channel *chan, void *data) close(fds[0]); close(fds[1]); ast_log(LOG_WARNING, "Unable to set write format to signed linear\n"); + LOCAL_USER_REMOVE(u); return -1; } if (((char *)data)[0] == '/') @@ -174,11 +180,14 @@ static int ices_exec(struct ast_channel *chan, void *data) } } close(fds[1]); - LOCAL_USER_REMOVE(u); + if (pid > -1) kill(pid, SIGKILL); if (!res && oreadformat) ast_set_read_format(chan, oreadformat); + + LOCAL_USER_REMOVE(u); + return res; } |