diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-11 05:59:08 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-11 05:59:08 +0000 |
commit | 3b1f5b6402eca474e2be5f9029ec691e4e089f76 (patch) | |
tree | f3beabc0b653e9abe03c2b4d99639fd0459e5b18 /apps | |
parent | 52542422b51005b5c98c75cbc16278534e78f70f (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.2@218052 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-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 461a0e74f..573dc678d 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2512,6 +2512,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; @@ -2872,7 +2873,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) { @@ -2966,7 +2971,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; @@ -2981,7 +2990,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; @@ -2996,18 +3008,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))) { |