Merged revisions 89099 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 8 Nov 2007 01:30:29 +0000 (01:30 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 8 Nov 2007 01:30:29 +0000 (01:30 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89099 | file | 2007-11-07 21:28:56 -0400 (Wed, 07 Nov 2007) | 6 lines

Improve the devicestate logic for multiple devices. If any are available then the extension is considered available.
(closes issue #10164)
Reported by: nic_bellamy
Patches:
      sip-hinting-svn-branch-1.4.patch uploaded by nic (license 299)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89100 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index e84dd20..6c403bc 100644 (file)
@@ -7881,13 +7881,22 @@ static int transmit_state_notify(struct sip_pvt *p, int state, int full, int tim
        /* Check which device/devices we are watching  and if they are registered */
        if (ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, p->context, p->exten)) {
                char *hint2 = hint, *individual_hint = NULL;
+               int hint_count = 0, unavailable_count = 0;
+
                while ((individual_hint = strsep(&hint2, "&"))) {
-                       /* If they are not registered, we will override notification and show no availability */
-                       if (ast_device_state(individual_hint) == AST_DEVICE_UNAVAILABLE) {
-                               local_state = NOTIFY_CLOSED;
-                               pidfstate = "away";
-                               pidfnote = "Not online";
-                       }
+                       hint_count++;
+
+                       if (ast_device_state(individual_hint) == AST_DEVICE_UNAVAILABLE)
+                               unavailable_count++;
+               }
+
+               /* If none of the hinted devices are registered, we will
+                * override notification and show no availability.
+                */
+               if (hint_count > 0 && hint_count == unavailable_count) {
+                       local_state = NOTIFY_CLOSED;
+                       pidfstate = "away";
+                       pidfnote = "Not online";
                }
        }