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

Merged revisions 204681 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r204681 | dvossel | 2009-07-02 10:05:57 -0500 (Thu, 02 Jul 2009) | 14 lines
  
  Improved mapping of extension states from combined device states.
  
  This fixes a few issues with incorrect extension states and adds
  a cli command, core show device2extenstate, to display all possible
  state mappings.
  
  (closes issue #15413)
  Reported by: legart
  Patches:
        exten_helper.diff uploaded by dvossel (license 671)
  Tested by: dvossel, legart, amilcar
  
  Review: https://reviewboard.asterisk.org/r/301/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-07-02 16:03:44 +00:00
parent d92d4d21d6
commit 48c9a85d91
3 changed files with 87 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
main/devicestate.c
View File

@@ -746,14 +746,12 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev
break;
case AST_DEVICE_INUSE:
agg->in_use = 1;
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;
@@ -761,7 +759,6 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev
case AST_DEVICE_RINGINUSE:
agg->in_use = 1;
agg->ring = 1;
agg->all_busy = 0;
agg->all_unavail = 0;
agg->all_free = 0;
agg->all_unknown = 0;
@@ -786,43 +783,60 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev
agg->all_free = 0;
break;
case AST_DEVICE_UNKNOWN:
agg->all_busy = 0;
agg->all_free = 0;
break;
case AST_DEVICE_TOTAL: /* not a device state, included for completeness. */
break;
}
}
enum ast_extension_states ast_devstate_to_extenstate(enum ast_device_state devstate)
{
switch (devstate) {
case AST_DEVICE_ONHOLD:
return AST_EXTENSION_ONHOLD;
case AST_DEVICE_BUSY:
return AST_EXTENSION_BUSY;
case AST_DEVICE_UNAVAILABLE:
case AST_DEVICE_UNKNOWN:
case AST_DEVICE_INVALID:
return AST_EXTENSION_UNAVAILABLE;
case AST_DEVICE_RINGINUSE:
return (AST_EXTENSION_INUSE | AST_EXTENSION_RINGING);
case AST_DEVICE_RINGING:
return AST_EXTENSION_RINGING;
case AST_DEVICE_INUSE:
return AST_EXTENSION_INUSE;
case AST_DEVICE_NOT_INUSE:
return AST_EXTENSION_NOT_INUSE;
case AST_DEVICE_TOTAL: /* not a device state, included for completeness */
break;
}
return AST_EXTENSION_NOT_INUSE;
}
enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregate *agg)
{
if (agg->all_unknown) {
return AST_DEVICE_UNKNOWN;
}
if (agg->all_free) {
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) {
return AST_DEVICE_BUSY;
}
if (agg->in_use) {
return AST_DEVICE_INUSE;
}
if (agg->ring) {
if (agg->ring)
return AST_DEVICE_RINGING;
}
if (agg->on_hold) {
if (agg->busy)
return AST_DEVICE_BUSY;
if (agg->in_use)
return AST_DEVICE_INUSE;
if (agg->on_hold)
return AST_DEVICE_ONHOLD;
}
if (agg->all_unavail) {
if (agg->all_busy)
return AST_DEVICE_BUSY;
if (agg->all_unknown)
return AST_DEVICE_UNKNOWN;
if (agg->all_unavail)
return AST_DEVICE_UNAVAILABLE;
}
return AST_DEVICE_NOT_INUSE;
}