|
|
|
@ -226,6 +226,7 @@ struct ast_call_queue {
|
|
|
|
|
int wrapped; /* Round Robin - wrapped around? */
|
|
|
|
|
int joinempty; /* Do we care if the queue has no members? */
|
|
|
|
|
int eventwhencalled; /* Generate an event when the agent is called (before pickup) */
|
|
|
|
|
int leavewhenempty; /* If all agents leave the queue, remove callers from the queue */
|
|
|
|
|
|
|
|
|
|
struct member *members; /* Member channels to be tried */
|
|
|
|
|
struct queue_ent *head; /* Start of the actual queue */
|
|
|
|
@ -912,6 +913,12 @@ static int wait_our_turn(struct queue_ent *qe, int ringing)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* leave the queue if no agents, if enabled */
|
|
|
|
|
if (!(qe->parent->members) && qe->parent->leavewhenempty) {
|
|
|
|
|
leave_queue(qe);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make a position announcement, if enabled */
|
|
|
|
|
if (qe->parent->announcefrequency && !ringing)
|
|
|
|
|
say_position(qe);
|
|
|
|
@ -1626,7 +1633,7 @@ check_turns:
|
|
|
|
|
/* This is the wait loop for the head caller*/
|
|
|
|
|
/* To exit, they may get their call answered; */
|
|
|
|
|
/* they may dial a digit from the queue context; */
|
|
|
|
|
/* or, they may may timeout. */
|
|
|
|
|
/* or, they may timeout. */
|
|
|
|
|
|
|
|
|
|
/* Leave if we have exceeded our queuetimeout */
|
|
|
|
|
if (qe.queuetimeout && ( (time(NULL) - qe.start) >= qe.queuetimeout) ) {
|
|
|
|
@ -1634,6 +1641,12 @@ check_turns:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* leave the queue if no agents, if enabled */
|
|
|
|
|
if (!((qe.parent)->members) && (qe.parent)->leavewhenempty) {
|
|
|
|
|
leave_queue(&qe);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Make a position announcement, if enabled */
|
|
|
|
|
if (qe.parent->announcefrequency && !ringing)
|
|
|
|
|
say_position(&qe);
|
|
|
|
@ -1872,6 +1885,8 @@ static void reload_queues(void)
|
|
|
|
|
}
|
|
|
|
|
} else if (!strcasecmp(var->name, "joinempty")) {
|
|
|
|
|
q->joinempty = ast_true(var->value);
|
|
|
|
|
} else if (!strcasecmp(var->name, "leavewhenempty")) {
|
|
|
|
|
q->leavewhenempty = ast_true(var->value);
|
|
|
|
|
} else if (!strcasecmp(var->name, "eventwhencalled")) {
|
|
|
|
|
q->eventwhencalled = ast_true(var->value);
|
|
|
|
|
} else {
|
|
|
|
|