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

Merged revisions 199298 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@199300 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-06-05 21:32:16 +00:00
parent 64097edf92
commit b5e3d0c902
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/devicestate.h
View File

@@ -255,7 +255,7 @@ struct ast_devstate_aggregate {
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;
unsigned int all_on_hold:1; unsigned int on_hold:1;
unsigned int busy:1; unsigned int busy:1;
unsigned int in_use:1; unsigned int in_use:1;
unsigned int ring:1; unsigned int ring:1;

35
main/devicestate.c
View File

@@ -764,7 +764,6 @@ void ast_devstate_aggregate_init(struct ast_devstate_aggregate *agg)
agg->all_unavail = 1; agg->all_unavail = 1;
agg->all_busy = 1; agg->all_busy = 1;
agg->all_free = 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) 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: case AST_DEVICE_NOT_INUSE:
agg->all_unavail = 0; agg->all_unavail = 0;
agg->all_busy = 0; agg->all_busy = 0;
agg->all_on_hold = 0;
break; break;
case AST_DEVICE_INUSE: case AST_DEVICE_INUSE:
agg->in_use = 1; agg->in_use = 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_on_hold = 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_on_hold = 0;
break; break;
case AST_DEVICE_RINGINUSE: case AST_DEVICE_RINGINUSE:
agg->in_use = 1; 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_busy = 0;
agg->all_unavail = 0; agg->all_unavail = 0;
agg->all_free = 0; agg->all_free = 0;
agg->all_on_hold = 0;
break; break;
case AST_DEVICE_ONHOLD: case AST_DEVICE_ONHOLD:
agg->all_unavail = 0; agg->all_unavail = 0;
agg->all_free = 0; agg->all_free = 0;
agg->on_hold = 1;
break; break;
case AST_DEVICE_BUSY: case AST_DEVICE_BUSY:
agg->all_unavail = 0; agg->all_unavail = 0;
agg->all_free = 0; agg->all_free = 0;
agg->all_on_hold = 0;
agg->busy = 1; agg->busy = 1;
agg->in_use = 1;
break; break;
case AST_DEVICE_UNAVAILABLE: case AST_DEVICE_UNAVAILABLE:
case AST_DEVICE_INVALID: case AST_DEVICE_INVALID:
agg->all_busy = 0; agg->all_busy = 0;
agg->all_free = 0; agg->all_free = 0;
agg->all_on_hold = 0;
break; break;
case AST_DEVICE_UNKNOWN: case AST_DEVICE_UNKNOWN:
break; break;
@@ -822,25 +817,25 @@ enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregat
{ {
if (agg->all_free) if (agg->all_free)
return AST_DEVICE_NOT_INUSE; return AST_DEVICE_NOT_INUSE;
if (agg->all_on_hold) if ((agg->in_use || agg->on_hold) && agg->ring)
return AST_DEVICE_ONHOLD; return AST_DEVICE_RINGINUSE;
if (agg->all_busy) if (agg->all_busy)
return AST_DEVICE_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) if (agg->in_use)
return AST_DEVICE_INUSE; return AST_DEVICE_INUSE;
if (agg->busy) if (agg->ring)
return AST_DEVICE_BUSY; 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; return AST_DEVICE_NOT_INUSE;
} }