kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 17:27:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make invalid hints report Unavailable instead of Idle.

Browse Source 
(closes issue #14413)
Reported by: pj


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203702 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-06-26 19:31:14 +00:00
parent 59c1998d67
commit cce4fad522
3 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asterisk/devicestate.h
View File

@@ -253,6 +253,7 @@ enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregat
* This struct is only here so that it can be easily declared on the stack. * This struct is only here so that it can be easily declared on the stack.
*/ */
struct ast_devstate_aggregate { struct ast_devstate_aggregate {
unsigned int all_unknown:1;
unsigned int all_unavail:1; unsigned int all_unavail:1;
unsigned int all_busy:1; unsigned int all_busy:1;
unsigned int all_free:1; unsigned int all_free:1;

36
main/devicestate.c
View File

@@ -350,9 +350,6 @@ static enum ast_device_state _ast_device_state(const char *device, int check_cac
res = ast_parse_device_state(device); res = ast_parse_device_state(device);
if (res == AST_DEVICE_UNKNOWN)
return AST_DEVICE_NOT_INUSE;
return res; return res;
} }
@@ -733,6 +730,7 @@ void ast_devstate_aggregate_init(struct ast_devstate_aggregate *agg)
{ {
memset(agg, 0, sizeof(*agg)); memset(agg, 0, sizeof(*agg));
agg->all_unknown = 1;
agg->all_unavail = 1; agg->all_unavail = 1;
agg->all_busy = 1; agg->all_busy = 1;
agg->all_free = 1; agg->all_free = 1;
@@ -742,6 +740,7 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev
{ {
switch (state) { switch (state) {
case AST_DEVICE_NOT_INUSE: case AST_DEVICE_NOT_INUSE:
agg->all_unknown = 0;
agg->all_unavail = 0; agg->all_unavail = 0;
agg->all_busy = 0; agg->all_busy = 0;
break; break;
@@ -750,12 +749,14 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev
agg->all_busy = 0; agg->all_busy = 0;
agg->all_unavail = 0; agg->all_unavail = 0;
agg->all_free = 0; agg->all_free = 0;
agg->all_unknown = 0;
break; break;
case AST_DEVICE_RINGING: case AST_DEVICE_RINGING:
agg->ring = 1; agg->ring = 1;
agg->all_busy = 0; agg->all_busy = 0;
agg->all_unavail = 0; agg->all_unavail = 0;
agg->all_free = 0; agg->all_free = 0;
agg->all_unknown = 0;
break; break;
case AST_DEVICE_RINGINUSE: case AST_DEVICE_RINGINUSE:
agg->in_use = 1; agg->in_use = 1;
@@ -763,19 +764,23 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev
agg->all_busy = 0; agg->all_busy = 0;
agg->all_unavail = 0; agg->all_unavail = 0;
agg->all_free = 0; agg->all_free = 0;
agg->all_unknown = 0;
break; break;
case AST_DEVICE_ONHOLD: case AST_DEVICE_ONHOLD:
agg->all_unknown = 0;
agg->all_unavail = 0; agg->all_unavail = 0;
agg->all_free = 0; agg->all_free = 0;
agg->on_hold = 1; agg->on_hold = 1;
break; break;
case AST_DEVICE_BUSY: case AST_DEVICE_BUSY:
agg->all_unknown = 0;
agg->all_unavail = 0; agg->all_unavail = 0;
agg->all_free = 0; agg->all_free = 0;
agg->busy = 1; agg->busy = 1;
agg->in_use = 1; agg->in_use = 1;
break; break;
case AST_DEVICE_UNAVAILABLE: case AST_DEVICE_UNAVAILABLE:
agg->all_unknown = 0;
case AST_DEVICE_INVALID: case AST_DEVICE_INVALID:
agg->all_busy = 0; agg->all_busy = 0;
agg->all_free = 0; agg->all_free = 0;
@@ -787,26 +792,37 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev
enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregate *agg) enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregate *agg)
{ {
if (agg->all_free) if (agg->all_unknown) {
return AST_DEVICE_UNKNOWN;
}
if (agg->all_free) {
return AST_DEVICE_NOT_INUSE; return AST_DEVICE_NOT_INUSE;
}
if ((agg->in_use || agg->on_hold) && agg->ring) if ((agg->in_use || agg->on_hold) && agg->ring) {
return AST_DEVICE_RINGINUSE; return AST_DEVICE_RINGINUSE;
}
if (agg->all_busy) if (agg->all_busy) {
return AST_DEVICE_BUSY; return AST_DEVICE_BUSY;
}
if (agg->in_use) if (agg->in_use) {
return AST_DEVICE_INUSE; return AST_DEVICE_INUSE;
}
if (agg->ring) if (agg->ring) {
return AST_DEVICE_RINGING; return AST_DEVICE_RINGING;
}
if (agg->on_hold) if (agg->on_hold) {
return AST_DEVICE_ONHOLD; return AST_DEVICE_ONHOLD;
}
if (agg->all_unavail) if (agg->all_unavail) {
return AST_DEVICE_UNAVAILABLE; return AST_DEVICE_UNAVAILABLE;
}
return AST_DEVICE_NOT_INUSE; return AST_DEVICE_NOT_INUSE;
} }

7
main/pbx.c
View File

@@ -4101,8 +4101,9 @@ static int ast_extension_state2(struct ast_exten *e)
rest = ast_str_buffer(hint); /* One or more devices separated with a & character */ rest = ast_str_buffer(hint); /* One or more devices separated with a & character */
while ( (cur = strsep(&rest, "&")) ) while ( (cur = strsep(&rest, "&")) ) {
ast_devstate_aggregate_add(&agg, ast_device_state(cur)); ast_devstate_aggregate_add(&agg, ast_device_state(cur));
}
state = ast_devstate_aggregate_result(&agg); state = ast_devstate_aggregate_result(&agg);
@@ -4112,6 +4113,8 @@ static int ast_extension_state2(struct ast_exten *e)
case AST_DEVICE_BUSY: case AST_DEVICE_BUSY:
return AST_EXTENSION_BUSY; return AST_EXTENSION_BUSY;
case AST_DEVICE_UNAVAILABLE: case AST_DEVICE_UNAVAILABLE:
case AST_DEVICE_UNKNOWN:
case AST_DEVICE_INVALID:
return AST_EXTENSION_UNAVAILABLE; return AST_EXTENSION_UNAVAILABLE;
case AST_DEVICE_RINGINUSE: case AST_DEVICE_RINGINUSE:
return (AST_EXTENSION_INUSE | AST_EXTENSION_RINGING); return (AST_EXTENSION_INUSE | AST_EXTENSION_RINGING);
@@ -4119,8 +4122,6 @@ static int ast_extension_state2(struct ast_exten *e)
return AST_EXTENSION_RINGING; return AST_EXTENSION_RINGING;
case AST_DEVICE_INUSE: case AST_DEVICE_INUSE:
return AST_EXTENSION_INUSE; return AST_EXTENSION_INUSE;
case AST_DEVICE_UNKNOWN:
case AST_DEVICE_INVALID:
case AST_DEVICE_NOT_INUSE: case AST_DEVICE_NOT_INUSE:
return AST_EXTENSION_NOT_INUSE; return AST_EXTENSION_NOT_INUSE;
} }