mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-18 18:46:16 +00:00
If all members are paused, the wrong status is indicated.
(closes issue #17576) Reported by: ramonpeek Patches: diff.txt uploaded by ramonpeek (license 266) Tested by: ramonpeek git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@273639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -574,6 +574,7 @@ static enum queue_member_status get_member_status(struct call_queue *q, int max_
|
||||
struct member *member;
|
||||
struct ao2_iterator mem_iter;
|
||||
enum queue_member_status result = QUEUE_NO_MEMBERS;
|
||||
int allpaused = 1;
|
||||
|
||||
ao2_lock(q);
|
||||
mem_iter = ao2_iterator_init(q->members, 0);
|
||||
@@ -586,6 +587,8 @@ static enum queue_member_status get_member_status(struct call_queue *q, int max_
|
||||
if (member->paused) {
|
||||
ao2_ref(member, -1);
|
||||
continue;
|
||||
} else {
|
||||
allpaused = 0;
|
||||
}
|
||||
|
||||
switch (member->status) {
|
||||
@@ -605,6 +608,10 @@ static enum queue_member_status get_member_status(struct call_queue *q, int max_
|
||||
}
|
||||
ao2_iterator_destroy(&mem_iter);
|
||||
ao2_unlock(q);
|
||||
|
||||
if (allpaused) {
|
||||
result = QUEUE_NO_REACHABLE_MEMBERS;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user