diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-26 19:49:28 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-26 19:49:28 +0000 |
commit | bfdeffc6d31a93fb9877579e058bac31fee70c00 (patch) | |
tree | 2c93b7e59d084edb19592ecbdac3b4224de2fbcf /main/devicestate.c | |
parent | ef32ca84849de20e6a84f1a5d28ea719e8802505 (diff) |
Merged revisions 203702 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r203702 | russell | 2009-06-26 14:31:14 -0500 (Fri, 26 Jun 2009) | 5 lines
Make invalid hints report Unavailable instead of Idle.
(closes issue #14413)
Reported by: pj
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@203715 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/devicestate.c')
-rw-r--r-- | main/devicestate.c | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/main/devicestate.c b/main/devicestate.c index 29f7c5b32..016f2d6a3 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -354,9 +354,6 @@ static enum ast_device_state _ast_device_state(const char *device, int check_cac res = ast_parse_device_state(device); - if (res == AST_DEVICE_UNKNOWN) - return AST_DEVICE_NOT_INUSE; - return res; } @@ -737,6 +734,7 @@ void ast_devstate_aggregate_init(struct ast_devstate_aggregate *agg) { memset(agg, 0, sizeof(*agg)); + agg->all_unknown = 1; agg->all_unavail = 1; agg->all_busy = 1; agg->all_free = 1; @@ -746,6 +744,7 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev { switch (state) { case AST_DEVICE_NOT_INUSE: + agg->all_unknown = 0; agg->all_unavail = 0; agg->all_busy = 0; break; @@ -754,12 +753,14 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev agg->all_busy = 0; agg->all_unavail = 0; agg->all_free = 0; + agg->all_unknown = 0; break; case AST_DEVICE_RINGING: agg->ring = 1; agg->all_busy = 0; agg->all_unavail = 0; agg->all_free = 0; + agg->all_unknown = 0; break; case AST_DEVICE_RINGINUSE: agg->in_use = 1; @@ -767,19 +768,23 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev agg->all_busy = 0; agg->all_unavail = 0; agg->all_free = 0; + agg->all_unknown = 0; break; case AST_DEVICE_ONHOLD: + agg->all_unknown = 0; agg->all_unavail = 0; agg->all_free = 0; agg->on_hold = 1; break; case AST_DEVICE_BUSY: + agg->all_unknown = 0; agg->all_unavail = 0; agg->all_free = 0; agg->busy = 1; agg->in_use = 1; break; case AST_DEVICE_UNAVAILABLE: + agg->all_unknown = 0; case AST_DEVICE_INVALID: agg->all_busy = 0; agg->all_free = 0; @@ -791,26 +796,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) { - if (agg->all_free) + if (agg->all_unknown) { + return AST_DEVICE_UNKNOWN; + } + + if (agg->all_free) { 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; + } - if (agg->all_busy) + if (agg->all_busy) { return AST_DEVICE_BUSY; + } - if (agg->in_use) + if (agg->in_use) { return AST_DEVICE_INUSE; + } - if (agg->ring) + if (agg->ring) { return AST_DEVICE_RINGING; + } - if (agg->on_hold) + if (agg->on_hold) { return AST_DEVICE_ONHOLD; + } - if (agg->all_unavail) + if (agg->all_unavail) { return AST_DEVICE_UNAVAILABLE; + } return AST_DEVICE_NOT_INUSE; } |