diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-04 22:23:52 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-04 22:23:52 +0000 |
commit | 8f79f35abac12ea17ce9bc8e7a53543562b0f991 (patch) | |
tree | 50eb4bfc3d738b3cece67168d02153b23d2502fa /apps | |
parent | 44780eaace7ac309f34e204137711e7cac69c8e7 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@173534 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_queue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 3f40bd564..26f2237f2 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2245,7 +2245,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]; @@ -2271,7 +2271,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; } @@ -5535,7 +5535,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); |