diff options
| author | Russell Bryant <russell@russellbryant.com> | 2005-10-19 18:19:02 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2005-10-19 18:19:02 +0000 |
| commit | 4aa7912057e83f052e94637f0b1a10026fe14558 (patch) | |
| tree | 5fee3540f8d72d45cd1b2e5bf15e5860581dd4f8 /apps/app_senddtmf.c | |
| parent | e5afdbbe160b3267df769c9f04c04c6f152b1c94 (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: https://origsvn.digium.com/svn/asterisk/trunk@6832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_senddtmf.c')
| -rwxr-xr-x | apps/app_senddtmf.c | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c index 79001acca..e42f06587 100755 --- a/apps/app_senddtmf.c +++ b/apps/app_senddtmf.c @@ -62,21 +62,33 @@ static int senddtmf_exec(struct ast_channel *chan, void *data) char *digits = NULL, *to = NULL; int timeout = 250; - if (data && !ast_strlen_zero(data) && (digits = ast_strdupa((char *)data))) { - if((to = strchr(digits,'|'))) { - *to = '\0'; - to++; - timeout = atoi(to); - } - LOCAL_USER_ADD(u); - if(timeout <= 0) - timeout = 250; - - res = ast_dtmf_stream(chan,NULL,digits,timeout); - LOCAL_USER_REMOVE(u); - } else { + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "SendDTMF requires an argument (digits or *#aAbBcCdD)\n"); + return 0; + } + + LOCAL_USER_ADD(u); + + digits = ast_strdupa(data); + if (!digits) { + ast_log(LOG_ERROR, "Out of Memory!\n"); + LOCAL_USER_REMOVE(u); + return -1; } + + if ((to = strchr(digits,'|'))) { + *to = '\0'; + to++; + timeout = atoi(to); + } + + if(timeout <= 0) + timeout = 250; + + res = ast_dtmf_stream(chan,NULL,digits,timeout); + + LOCAL_USER_REMOVE(u); + return res; } |