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_softhangup.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_softhangup.c')
-rwxr-xr-x | apps/app_softhangup.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c index 9c57465eb..96fa6c12b 100755 --- a/apps/app_softhangup.c +++ b/apps/app_softhangup.c @@ -60,17 +60,18 @@ static int softhangup_exec(struct ast_channel *chan, void *data) char *options, *cut, *cdata, *match; char name[AST_CHANNEL_NAME] = ""; int all = 0; - - if (!data) { + + if (!data || ast_strlen_zero(data)) { ast_log(LOG_WARNING, "SoftHangup requires an argument (Technology/resource)\n"); return 0; } + LOCAL_USER_ADD(u); + cdata = ast_strdupa(data); match = strsep(&cdata, "|"); options = strsep(&cdata, "|"); all = options && strchr(options,'a'); - LOCAL_USER_ADD(u); c = ast_channel_walk_locked(NULL); while (c) { strncpy(name, c->name, sizeof(name)-1); @@ -95,6 +96,7 @@ static int softhangup_exec(struct ast_channel *chan, void *data) } c = ast_channel_walk_locked(c); } + LOCAL_USER_REMOVE(u); return 0; |