From a7dee30a8d8e45bee835a4decb4ce513316786b9 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 28 Dec 2007 00:16:15 +0000 Subject: [PATCH] I found a bug while browsing the queue code and managed to reproduce it in a small setup. If a queue uses the ringall strategy, it was possible through unfortunate coincidence for a single member at a given penalty level to make app_queue think that all members at that penalty level were unavailable and cause the members at the next penalty level to be rung. With this patch, we will only move to the next penalty level if ALL the members at a given penalty level are unreachable. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@95095 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index 159bdda654..9c23a816a3 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1922,17 +1922,15 @@ static int ring_one(struct queue_ent *qe, struct callattempt *outgoing, int *bus if (cur->stillgoing && !cur->chan && cur->metric <= best->metric) { if (option_debug) ast_log(LOG_DEBUG, "(Parallel) Trying '%s' with metric %d\n", cur->interface, cur->metric); - ring_entry(qe, cur, busies); + ret |= ring_entry(qe, cur, busies); } } } else { /* Ring just the best channel */ if (option_debug) ast_log(LOG_DEBUG, "Trying '%s' with metric %d\n", best->interface, best->metric); - ring_entry(qe, best, busies); + ret = ring_entry(qe, best, busies); } - if (best->chan) /* break out with result = 1 */ - ret = 1; } return ret;