diff options
Diffstat (limited to 'apps/app_queue.c')
| -rw-r--r-- | apps/app_queue.c | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 1ddfc9fb5..ba9faeb75 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2452,11 +2452,23 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r (res = say_position(qe))) break; + /* If we have timed out, break out */ + if (qe->expire && (time(NULL) > qe->expire)) { + *reason = QUEUE_TIMEOUT; + break; + } + /* Make a periodic announcement, if enabled */ if (qe->parent->periodicannouncefrequency && !ringing && (res = say_periodic_announcement(qe))) break; + /* If we have timed out, break out */ + if (qe->expire && (time(NULL) > qe->expire)) { + *reason = QUEUE_TIMEOUT; + break; + } + /* Wait a second before checking again */ if ((res = ast_waitfordigit(qe->chan, RECHECK * 1000))) { if (res > 0 && !valid_exit(qe, res)) @@ -2464,6 +2476,12 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r else break; } + + /* If we have timed out, break out */ + if (qe->expire && (time(NULL) > qe->expire)) { + *reason = QUEUE_TIMEOUT; + break; + } } return res; @@ -2700,6 +2718,15 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce memset(&bridge_config, 0, sizeof(bridge_config)); time(&now); + + /* If we've already exceeded our timeout, then just stop + * This should be extremely rare. queue_exec will take care + * of removing the caller and reporting the timeout as the reason. + */ + if (qe->expire && now > qe->expire) { + res = 0; + goto out; + } for (; options && *options; options++) switch (*options) { @@ -3929,11 +3956,27 @@ check_turns: } makeannouncement = 1; + /* Leave if we have exceeded our queuetimeout */ + if (qe.expire && (time(NULL) > qe.expire)) { + record_abandoned(&qe); + reason = QUEUE_TIMEOUT; + res = 0; + ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos); + break; + } /* Make a periodic announcement, if enabled */ if (qe.parent->periodicannouncefrequency && !ringing) if ((res = say_periodic_announcement(&qe))) goto stop; + /* Leave if we have exceeded our queuetimeout */ + if (qe.expire && (time(NULL) > qe.expire)) { + record_abandoned(&qe); + reason = QUEUE_TIMEOUT; + res = 0; + ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos); + break; + } /* Try calling all queue members for 'timeout' seconds */ res = try_calling(&qe, args.options, args.announceoverride, args.url, &tries, &noption, args.agi); if (res) @@ -3987,7 +4030,6 @@ check_turns: if (res) goto stop; - /* Since this is a priority queue and * it is not sure that we are still at the head * of the queue, go and check for our turn again. |