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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@203704 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/devicestate.h b/include/asterisk/devicestate.h
index 9b11519242ec3839312e47ece3d76438351732d4..dbd513fecfb140f927f7469cd5558eba7a2756fb 100644 (file)
--- a/include/asterisk/devicestate.h
+++ b/include/asterisk/devicestate.h
@@ -252,6 +252,7 @@ enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregat
  * This struct is only here so that it can be easily declared on the stack.
  */
 struct ast_devstate_aggregate {
+       unsigned int all_unknown:1;
        unsigned int all_unavail:1;
        unsigned int all_busy:1;
        unsigned int all_free:1;

diff --git a/main/devicestate.c b/main/devicestate.c
index c1007311616e32956eda82ff6d441b287ab29100..4013d0d7f4e28430aef23890d2cd065bf484a13f 100644 (file)
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -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;
 }

diff --git a/main/pbx.c b/main/pbx.c
index 8fdc769c957849ba1321ca6b3a3c4220bc51ade4..5734241f1c1a0c916eb1625af121c9d90b0abddd 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -3274,8 +3274,9 @@ static int ast_extension_state2(struct ast_exten *e)
 
        rest = hint;    /* One or more devices separated with a & character */
 
-       while ( (cur = strsep(&rest, "&")) )
+       while ( (cur = strsep(&rest, "&")) ) {
                ast_devstate_aggregate_add(&agg, ast_device_state(cur));
+       }
 
        state = ast_devstate_aggregate_result(&agg);
 
@@ -3285,6 +3286,8 @@ static int ast_extension_state2(struct ast_exten *e)
        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);
@@ -3292,8 +3295,6 @@ static int ast_extension_state2(struct ast_exten *e)
                return AST_EXTENSION_RINGING;
        case AST_DEVICE_INUSE:
                return AST_EXTENSION_INUSE;
-       case AST_DEVICE_UNKNOWN:
-       case AST_DEVICE_INVALID:
        case AST_DEVICE_NOT_INUSE:
                return AST_EXTENSION_NOT_INUSE;
        }