mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-02 11:58:40 +00:00
Merged revisions 247169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r247169 | mmichelson | 2010-02-17 10:24:54 -0600 (Wed, 17 Feb 2010) | 9 lines Merged revisions 247168 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r247168 | mmichelson | 2010-02-17 10:24:17 -0600 (Wed, 17 Feb 2010) | 3 lines Make sure that when autofill is disabled that callers not in the front of the queue cannot place calls. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@247171 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2920,9 +2920,11 @@ static int is_our_turn(struct queue_ent *qe)
|
|||||||
}
|
}
|
||||||
|
|
||||||
ao2_unlock(qe->parent);
|
ao2_unlock(qe->parent);
|
||||||
|
/* If the queue entry is within avl [the number of available members] calls from the top ...
|
||||||
/* If the queue entry is within avl [the number of available members] calls from the top ... */
|
* Autofill and position check added to support autofill=no (as only calls
|
||||||
if (ch && idx < avl) {
|
* from the front of the queue are valid when autofill is disabled)
|
||||||
|
*/
|
||||||
|
if (ch && idx < avl && (qe->parent->autofill || qe->pos == 1)) {
|
||||||
ast_debug(1, "It's our turn (%s).\n", qe->chan->name);
|
ast_debug(1, "It's our turn (%s).\n", qe->chan->name);
|
||||||
res = 1;
|
res = 1;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user