From e24a4644e4ae61f1a208ee7689db54bb4e80ccc8 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 4 Feb 2009 22:25:06 +0000 Subject: [PATCH] Merged revisions 173507 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r173507 | mmichelson | 2009-02-04 16:16:19 -0600 (Wed, 04 Feb 2009) | 7 lines Fix some areas where the incorrect interface was passed to ast_device_state 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/branches/1.6.1@173541 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index d398b0b284..16cfc22247 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2270,7 +2270,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(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]; @@ -2296,7 +2296,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies ast_verb(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; } @@ -5623,7 +5623,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);