Fix some state_interface stuff that was in trunk but not in the backport to 1.4.

Issue #14359 was fixed between the time that I posted the review of the backport
of the state interface change for 1.4. This merges the changes from that issue
back into 1.4.

(closes issue #14359)
Reported by: francesco_r

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 9106928f74b5a293d9347fb9b049170f62f35a9b..374f4e9451ebce3bcbefedb80070b039a38a5b8b 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1922,7 +1922,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
                        ast_cdr_busy(qe->chan->cdr);
                tmp->stillgoing = 0;
 
-               update_status(tmp->member->interface, ast_device_state(tmp->member->state_interface));
+               update_status(tmp->member->state_interface, ast_device_state(tmp->member->state_interface));
 
                ast_mutex_lock(&qe->parent->lock);
                qe->parent->rrpos++;
@@ -1974,7 +1974,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
                        ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", tmp->interface);
                do_hang(tmp);
                (*busies)++;
-               update_status(tmp->member->interface, ast_device_state(tmp->member->interface));
+               update_status(tmp->member->state_interface, ast_device_state(tmp->member->state_interface));
                return 0;
        } else if (qe->parent->eventwhencalled) {
                char vars[2048];
@@ -1998,7 +1998,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
                        ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", tmp->interface);
        }
 
-       update_status(tmp->member->interface, ast_device_state(tmp->member->interface));
+       update_status(tmp->member->state_interface, ast_device_state(tmp->member->state_interface));
        return 1;
 }
 
@@ -4494,7 +4494,7 @@ static int reload_queues(void)
                        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);
                        }
                        ast_mutex_unlock(&q->lock);