kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 134758 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r134758 | mmichelson | 2008-07-31 10:56:18 -0500 (Thu, 31 Jul 2008) | 16 lines

Add more timeout checks into app_queue, specifically
targeting areas where an unknown and potentially
long time has just elapsed. Also added a check
to try_calling() to return early if the timeout
has elapsed instead of potentially setting a negative
timeout for the call (thus making it have *no* timeout
at all).


(closes issue #13186)
Reported by: miquel_cabrespina
Patches:
      13186.diff uploaded by putnopvut (license 60)
Tested by: miquel_cabrespina


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-07-31 16:05:12 +00:00
parent 68eaf774cc
commit 95ab87a07d
1 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/app_queue.c
View File

@@ -2887,6 +2887,12 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
(res = say_position(qe,ringing))) (res = say_position(qe,ringing)))
break; 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 */ /* Make a periodic announcement, if enabled */
if (qe->parent->periodicannouncefrequency && if (qe->parent->periodicannouncefrequency &&
(res = say_periodic_announcement(qe,ringing))) (res = say_periodic_announcement(qe,ringing)))
@@ -2897,6 +2903,12 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
update_qe_rule(qe); update_qe_rule(qe);
} }
/* If we have timed out, break out */
if (qe->expire && (time(NULL) > qe->expire)) {
*reason = QUEUE_TIMEOUT;
break;
}
/* Wait a second before checking again */ /* Wait a second before checking again */
if ((res = ast_waitfordigit(qe->chan, RECHECK * 1000))) { if ((res = ast_waitfordigit(qe->chan, RECHECK * 1000))) {
if (res > 0 && !valid_exit(qe, res)) if (res > 0 && !valid_exit(qe, res))
@@ -2904,6 +2916,12 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r
else else
break; break;
} }
/* If we have timed out, break out */
if (qe->expire && (time(NULL) > qe->expire)) {
*reason = QUEUE_TIMEOUT;
break;
}
} }
return res; return res;
@@ -3220,6 +3238,15 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
tmpid[0] = 0; tmpid[0] = 0;
meid[0] = 0; meid[0] = 0;
time(&now); 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++) for (; options && *options; options++)
switch (*options) { switch (*options) {
@@ -4699,6 +4726,15 @@ check_turns:
if (qe.parent->periodicannouncefrequency) if (qe.parent->periodicannouncefrequency)
if ((res = say_periodic_announcement(&qe,ringing))) if ((res = say_periodic_announcement(&qe,ringing)))
goto stop; 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;
}
/* see if we need to move to the next penalty level for this queue */ /* see if we need to move to the next penalty level for this queue */
while (qe.pr && ((time(NULL) - qe.start) > qe.pr->time)) { while (qe.pr && ((time(NULL) - qe.start) > qe.pr->time)) {
@@ -4758,7 +4794,6 @@ check_turns:
/* If using dynamic realtime members, we should regenerate the member list for this queue */ /* If using dynamic realtime members, we should regenerate the member list for this queue */
update_realtime_members(qe.parent); update_realtime_members(qe.parent);
/* OK, we didn't get anybody; wait for 'retry' seconds; may get a digit to exit with */ /* OK, we didn't get anybody; wait for 'retry' seconds; may get a digit to exit with */
res = wait_a_bit(&qe); res = wait_a_bit(&qe);
if (res) if (res)