diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-05 21:32:16 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-05 21:32:16 +0000 |
| commit | 004d6b79422a260e14952dcc192b8351fceff718 (patch) | |
| tree | efd3346d83d62269625e399c8017902d90c6e4c3 /main | |
| parent | fa1c5eec7495ec5d7ef708c271d39665a92f2034 (diff) | |
Merged revisions 199298 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r199298 | dvossel | 2009-06-05 16:21:22 -0500 (Fri, 05 Jun 2009) | 21 lines
Merged revisions 199297 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r199297 | dvossel | 2009-06-05 16:19:56 -0500 (Fri, 05 Jun 2009) | 14 lines
Fixes issue with hints giving unexpected results.
Hints with two or more devices that include ONHOLD gave unexpected results.
(closes issue #15057)
Reported by: p_lindheimer
Patches:
onhold_trunk.diff uploaded by dvossel (license 671)
pbx.c.1.4.patch uploaded by p (license 558)
devicestate.c.trunk.patch uploaded by p (license 671)
Tested by: p_lindheimer, dvossel
Review: https://reviewboard.asterisk.org/r/254/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@199300 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/devicestate.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/main/devicestate.c b/main/devicestate.c index 4503be444..c10073116 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -764,7 +764,6 @@ void ast_devstate_aggregate_init(struct ast_devstate_aggregate *agg) agg->all_unavail = 1; agg->all_busy = 1; agg->all_free = 1; - agg->all_on_hold = 1; } void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_device_state state) @@ -773,21 +772,18 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev case AST_DEVICE_NOT_INUSE: agg->all_unavail = 0; agg->all_busy = 0; - agg->all_on_hold = 0; break; case AST_DEVICE_INUSE: agg->in_use = 1; agg->all_busy = 0; agg->all_unavail = 0; agg->all_free = 0; - agg->all_on_hold = 0; break; case AST_DEVICE_RINGING: agg->ring = 1; agg->all_busy = 0; agg->all_unavail = 0; agg->all_free = 0; - agg->all_on_hold = 0; break; case AST_DEVICE_RINGINUSE: agg->in_use = 1; @@ -795,23 +791,22 @@ 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_on_hold = 0; break; case AST_DEVICE_ONHOLD: agg->all_unavail = 0; agg->all_free = 0; + agg->on_hold = 1; break; case AST_DEVICE_BUSY: agg->all_unavail = 0; agg->all_free = 0; - agg->all_on_hold = 0; agg->busy = 1; + agg->in_use = 1; break; case AST_DEVICE_UNAVAILABLE: case AST_DEVICE_INVALID: agg->all_busy = 0; agg->all_free = 0; - agg->all_on_hold = 0; break; case AST_DEVICE_UNKNOWN: break; @@ -822,25 +817,25 @@ enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregat { if (agg->all_free) return AST_DEVICE_NOT_INUSE; - - if (agg->all_on_hold) - return AST_DEVICE_ONHOLD; - + + if ((agg->in_use || agg->on_hold) && agg->ring) + return AST_DEVICE_RINGINUSE; + if (agg->all_busy) return AST_DEVICE_BUSY; - if (agg->all_unavail) - return AST_DEVICE_UNAVAILABLE; - - if (agg->ring) - return agg->in_use ? AST_DEVICE_RINGINUSE : AST_DEVICE_RINGING; - if (agg->in_use) return AST_DEVICE_INUSE; - if (agg->busy) - return AST_DEVICE_BUSY; - + if (agg->ring) + return AST_DEVICE_RINGING; + + if (agg->on_hold) + return AST_DEVICE_ONHOLD; + + if (agg->all_unavail) + return AST_DEVICE_UNAVAILABLE; + return AST_DEVICE_NOT_INUSE; } |