Fix some areas where the incorrect interface was passed to ast_device_state
authorMark Michelson <mmichelson@digium.com>
Wed, 4 Feb 2009 22:16:19 +0000 (22:16 +0000)
committerMark Michelson <mmichelson@digium.com>
Wed, 4 Feb 2009 22:16:19 +0000 (22:16 +0000)
I swear it feels like I already did this once...

(closes issue #14359)
Reported by: francesco_r

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

apps/app_queue.c

index caa6613..30ea73f 100644 (file)
@@ -2453,7 +2453,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
                ast_verb(3, "Couldn't call %s\n", tmp->interface);
                do_hang(tmp);
                (*busies)++;
-               update_status(qe->parent, tmp->member, ast_device_state(tmp->member->interface));
+               update_status(qe->parent, tmp->member, ast_device_state(tmp->member->state_interface));
                return 0;
        } else if (qe->parent->eventwhencalled) {
                char vars[2048];
@@ -2479,7 +2479,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
                ast_verb(3, "Called %s\n", tmp->interface);
        }
 
-       update_status(qe->parent, tmp->member, ast_device_state(tmp->member->interface));
+       update_status(qe->parent, tmp->member, ast_device_state(tmp->member->state_interface));
        return 1;
 }
 
@@ -5722,7 +5722,7 @@ static int reload_queues(int reload)
                        while ((cur = ao2_iterator_next(&mem_iter))) {
                                if (cur->dynamic)
                                        q->membercount++;
-                               cur->status = ast_device_state(cur->interface);
+                               cur->status = ast_device_state(cur->state_interface);
                                ao2_ref(cur, -1);
                        }
                        ao2_unlock(q);