From db55898c0df26d43c805f8ecaed3dea7a16f5538 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Sat, 20 May 2006 02:51:53 +0000 Subject: [PATCH] Merged revisions 28968 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r28968 | kpfleming | 2006-05-19 21:35:53 -0500 (Fri, 19 May 2006) | 2 lines don't allow queue member devices to ring longer than the total queue timeout (issue #6423, reported and patched by bcnit) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28970 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index fbdff1553e..e42ba36855 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2201,7 +2201,10 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce free(tmp); } } - to = (qe->parent->timeout) ? qe->parent->timeout * 1000 : -1; + if (qe->expire && (!qe->parent->timeout || (qe->expire - now) <= qe->parent->timeout)) + to = (qe->expire - now) * 1000; + else + to = (qe->parent->timeout) ? qe->parent->timeout * 1000 : -1; ring_one(qe, outgoing, &numbusies); ast_mutex_unlock(&qe->parent->lock); if (use_weight)