kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 10:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 173507 via svnmerge from

Browse Source 
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.0@173534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2009-02-04 22:23:52 +00:00
parent 8c1a726973
commit f94677ac39
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_queue.c
View File

@@ -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); ast_verb(3, "Couldn't call %s\n", tmp->interface);
do_hang(tmp); do_hang(tmp);
(*busies)++; (*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; return 0;
} else if (qe->parent->eventwhencalled) { } else if (qe->parent->eventwhencalled) {
char vars[2048]; 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); 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; return 1;
} }
@@ -5535,7 +5535,7 @@ static int reload_queues(int reload)
while ((cur = ao2_iterator_next(&mem_iter))) { while ((cur = ao2_iterator_next(&mem_iter))) {
if (cur->dynamic) if (cur->dynamic)
q->membercount++; q->membercount++;
cur->status = ast_device_state(cur->interface); cur->status = ast_device_state(cur->state_interface);
ao2_ref(cur, -1); ao2_ref(cur, -1);
} }
ao2_unlock(q); ao2_unlock(q);