kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 03:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 203702 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@203704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-06-26 19:37:43 +00:00
parent 642b571683
commit b7f327b069
3 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
main/devicestate.c
View File

@@ -378,9 +378,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;
}
@@ -761,6 +758,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;
@@ -770,6 +768,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;
@@ -778,12 +777,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;
@@ -791,19 +792,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;
@@ -815,26 +820,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;
}