diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-11 05:58:58 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-11 05:58:58 +0000 |
| commit | e69584d5e90bb1caae546f66ab1a08bd0176320d (patch) | |
| tree | bb3719330052aac83bde04503c1951027e79aae5 /apps/app_queue.c | |
| parent | c88c5f54924e33a0f3029b3524e0ed695380f435 (diff) | |
Merged revisions 217990 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r217990 | tilghman | 2009-09-10 18:54:51 -0500 (Thu, 10 Sep 2009) | 10 lines
Merged revisions 217989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r217989 | tilghman | 2009-09-10 18:52:22 -0500 (Thu, 10 Sep 2009) | 3 lines
Don't ring another channel, if there's not enough time for a queue member to answer.
(Fixes AST-228)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@218051 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_queue.c')
| -rw-r--r-- | apps/app_queue.c | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 111396dc3..aca8aaf24 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2280,6 +2280,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies /* Inherit specially named variables from parent channel */ ast_channel_inherit_variables(qe->chan, tmp->chan); + ast_channel_datastore_inherit(qe->chan, tmp->chan); /* Presense of ADSI CPE on outgoing channel follows ours */ tmp->chan->adsicpe = qe->chan->adsicpe; @@ -2615,7 +2616,11 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte *to = 0; return NULL; } + + /* Poll for events from both the incoming channel as well as any outgoing channels */ winner = ast_waitfor_n(watchers, pos, to); + + /* Service all of the outgoing channels */ for (o = start; o; o = o->call_next) { if (o->stillgoing && (o->chan) && (o->chan->_state == AST_STATE_UP)) { if (!peer) { @@ -2709,7 +2714,11 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) { if (qe->parent->timeoutrestart) *to = orig; - ring_one(qe, outgoing, &numbusies); + /* Have enough time for a queue member to answer? */ + if (*to > 500) { + ring_one(qe, outgoing, &numbusies); + starttime = (long) time(NULL); + } } numbusies++; break; @@ -2724,7 +2733,10 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) { if (qe->parent->timeoutrestart) *to = orig; - ring_one(qe, outgoing, &numbusies); + if (*to > 500) { + ring_one(qe, outgoing, &numbusies); + starttime = (long) time(NULL); + } } numbusies++; break; @@ -2739,18 +2751,23 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte } } ast_frfree(f); - } else { + } else { /* ast_read() returned NULL */ endtime = (long) time(NULL) - starttime; rna(endtime * 1000, qe, on, membername, 1); do_hang(o); if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) { if (qe->parent->timeoutrestart) *to = orig; - ring_one(qe, outgoing, &numbusies); + if (*to > 500) { + ring_one(qe, outgoing, &numbusies); + starttime = (long) time(NULL); + } } } } } + + /* If we received an event from the caller, deal with it. */ if (winner == in) { f = ast_read(in); if (!f || ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_HANGUP))) { |