kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 14:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't allow queue member devices to ring longer than the total queue timeout (issue #6423, reported and patched by bcnit)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@28968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-05-20 02:35:53 +00:00
parent 9123735599
commit e0989958cc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_queue.c
View File

@@ -2125,10 +2125,10 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
cur = cur->next; cur = cur->next;
} }
if (qe->parent->timeout) if (qe->expire && (!qe->parent->timeout || (qe->expire - now) <= qe->parent->timeout))
to = qe->parent->timeout * 1000; to = (qe->expire - now) * 1000;
else else
to = -1; to = (qe->parent->timeout) ? qe->parent->timeout * 1000 : -1;
ring_one(qe, outgoing, &numbusies); ring_one(qe, outgoing, &numbusies);
ast_mutex_unlock(&qe->parent->lock); ast_mutex_unlock(&qe->parent->lock);
if (use_weight) if (use_weight)