kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 19:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we catch all the instances where a member didn't answer the call sent to them rather than just on a timeout after a dial attempt and some minor code cleanup/reuse.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
BJ Weschke
2006-05-25 00:11:30 +00:00
parent eefc9193e7
commit 6848d55d85
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
apps/app_queue.c
View File

@@ -1659,6 +1659,23 @@ static void record_abandoned(struct queue_ent *qe)
ast_mutex_unlock(&qe->parent->lock); ast_mutex_unlock(&qe->parent->lock);
} }
static void rna(int rnatime, struct queue_ent *qe, char *membername)
{
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Nobody picked up in %d ms\n", rnatime);
ast_queue_log(qe->parent->name, qe->chan->uniqueid, membername, "RINGNOANSWER", "%d", rnatime);
if (qe->parent->autopause) {
if (!set_member_paused(qe->parent->name, membername, 1)) {
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Auto-Pausing Queue Member %s in queue %s since they failed to answer.\n", membername, qe->parent->name);
} else {
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Failed to pause Queue Member %s in queue %s!\n", membername, qe->parent->name);
}
}
return;
}
#define AST_MAX_WATCHERS 256 #define AST_MAX_WATCHERS 256
@@ -1677,6 +1694,10 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
struct ast_channel *winner; struct ast_channel *winner;
struct ast_channel *in = qe->chan; struct ast_channel *in = qe->chan;
char on[256] = ""; char on[256] = "";
long starttime = 0;
long endtime = 0;
starttime = (long)time(NULL);
while(*to && !peer) { while(*to && !peer) {
int numlines, retry, pos = 1; int numlines, retry, pos = 1;
@@ -1792,6 +1813,9 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
if (in->cdr) if (in->cdr)
ast_cdr_busy(in->cdr); ast_cdr_busy(in->cdr);
do_hang(o); do_hang(o);
endtime = (long)time(NULL);
endtime -= starttime;
rna(endtime*1000, qe, on);
if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) { if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
if (qe->parent->timeoutrestart) if (qe->parent->timeoutrestart)
*to = orig; *to = orig;
@@ -1804,6 +1828,9 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
ast_verbose( VERBOSE_PREFIX_3 "%s is circuit-busy\n", o->chan->name); ast_verbose( VERBOSE_PREFIX_3 "%s is circuit-busy\n", o->chan->name);
if (in->cdr) if (in->cdr)
ast_cdr_busy(in->cdr); ast_cdr_busy(in->cdr);
endtime = (long)time(NULL);
endtime -= starttime;
rna(endtime*1000, qe, on);
do_hang(o); do_hang(o);
if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) { if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
if (qe->parent->timeoutrestart) if (qe->parent->timeoutrestart)
@@ -1831,6 +1858,9 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
} }
ast_frfree(f); ast_frfree(f);
} else { } else {
endtime = (long)time(NULL);
endtime -= starttime;
rna(endtime*1000, qe, on);
do_hang(o); do_hang(o);
if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) { if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
if (qe->parent->timeoutrestart) if (qe->parent->timeoutrestart)
@@ -1872,20 +1902,8 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
} }
ast_frfree(f); ast_frfree(f);
} }
if (!*to) { if (!*to)
if (option_verbose > 2) rna(orig, qe, on);
ast_verbose( VERBOSE_PREFIX_3 "Nobody picked up in %d ms\n", orig);
ast_queue_log(qe->parent->name, qe->chan->uniqueid, on, "RINGNOANSWER", "%d", orig);
if (qe->parent->autopause) {
if (!set_member_paused(qe->parent->name, on, 1)) {
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Auto-Pausing Queue Member %s in queue %s since they failed to answer.\n", on, qe->parent->name);
} else {
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Failed to pause Queue Member %s in queue %s!\n", on, qe->parent->name);
}
}
}
} }
return peer; return peer;