diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-13 17:22:47 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-13 17:22:47 +0000 |
commit | 58f16a00448e7d6906f1ae872939b29181d7c7aa (patch) | |
tree | e18694013d7a79ef23ef9a7b39c0f213eccc3551 /apps/app_chanisavail.c | |
parent | fafc40dd5c5a93fbdea7479276e5935b042e64b9 (diff) |
Store the cause code that is returned when trying to create a channel in ChanIsAvail in the
AVAILCAUSECODE dialplan variable instead of overwriting the device state in AVAILSTATUS.
(closes issue #14426)
Reported by: macli
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@229970 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_chanisavail.c')
-rw-r--r-- | apps/app_chanisavail.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c index c1b33b938..5dd4a1f60 100644 --- a/apps/app_chanisavail.c +++ b/apps/app_chanisavail.c @@ -85,8 +85,11 @@ static const char app[] = "ChanIsAvail"; <para>The canonical channel name that was used to create the channel</para> </variable> <variable name="AVAILSTATUS"> - <para>The status code for the available channel</para> + <para>The device state for the device</para> </variable> + <variable name="AVAILCAUSECODE"> + <para>The cause code returned when requesting the channel</para> + </variable> </variablelist> </description> </application> @@ -100,6 +103,7 @@ static int chanavail_exec(struct ast_channel *chan, const char *data) struct ast_str *tmp_availchan = ast_str_alloca(2048); struct ast_str *tmp_availorig = ast_str_alloca(2048); struct ast_str *tmp_availstat = ast_str_alloca(2048); + struct ast_str *tmp_availcause = ast_str_alloca(2048); struct ast_channel *tempchan; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(reqchans); @@ -159,6 +163,8 @@ static int chanavail_exec(struct ast_channel *chan, const char *data) snprintf(trychan, sizeof(trychan), "%s/%s",cur,number); status = inuse = ast_device_state(trychan); } + snprintf(tmp, sizeof(tmp), "%d", status); + ast_str_append(&tmp_availstat, 0, "%s%s", ast_str_strlen(tmp_availstat) ? "&" : "", tmp); if ((inuse <= 1) && (tempchan = ast_request(tech, chan->nativeformats, chan, number, &status))) { ast_str_append(&tmp_availchan, 0, "%s%s", ast_str_strlen(tmp_availchan) ? "&" : "", tempchan->name); @@ -166,7 +172,7 @@ static int chanavail_exec(struct ast_channel *chan, const char *data) ast_str_append(&tmp_availorig, 0, "%s%s", ast_str_strlen(tmp_availorig) ? "&" : "", tmp); snprintf(tmp, sizeof(tmp), "%d", status); - ast_str_append(&tmp_availstat, 0, "%s%s", ast_str_strlen(tmp_availstat) ? "&" : "", tmp); + ast_str_append(&tmp_availcause, 0, "%s%s", ast_str_strlen(tmp_availcause) ? "&" : "", tmp); ast_hangup(tempchan); tempchan = NULL; @@ -174,9 +180,6 @@ static int chanavail_exec(struct ast_channel *chan, const char *data) if (!option_all_avail) { break; } - } else { - snprintf(tmp, sizeof(tmp), "%d", status); - ast_str_append(&tmp_availstat, 0, "%s%s", ast_str_strlen(tmp_availstat) ? "&" : "", tmp); } cur = rest; } while (cur); @@ -186,6 +189,7 @@ static int chanavail_exec(struct ast_channel *chan, const char *data) /* Store the originally used channel too */ pbx_builtin_setvar_helper(chan, "AVAILORIGCHAN", ast_str_buffer(tmp_availorig)); pbx_builtin_setvar_helper(chan, "AVAILSTATUS", ast_str_buffer(tmp_availstat)); + pbx_builtin_setvar_helper(chan, "AVAILCAUSECODE", ast_str_buffer(tmp_availcause)); return 0; } |