Merged revisions 173692 via svnmerge from
authorMark Michelson <mmichelson@digium.com>
Thu, 5 Feb 2009 20:30:45 +0000 (20:30 +0000)
committerMark Michelson <mmichelson@digium.com>
Thu, 5 Feb 2009 20:30:45 +0000 (20:30 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r173692 | mmichelson | 2009-02-05 14:29:09 -0600 (Thu, 05 Feb 2009) | 12 lines

Fix situations where queue members could be autopaused unexpectedly

Specifically, this patch prevents us from autopausing members when
we receive a busy or congestion frame from them.

(closes issue #14376)
Reported by: fiddur
Patches:
      14376.patch uploaded by putnopvut (license 60)
Tested by: fiddur

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@173693 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_queue.c

index 30ea73f..d1f20d6 100644 (file)
@@ -2664,7 +2664,7 @@ static void record_abandoned(struct queue_ent *qe)
 }
 
 /*! \brief RNA == Ring No Answer. Common code that is executed when we try a queue member and they don't answer. */
 }
 
 /*! \brief RNA == Ring No Answer. Common code that is executed when we try a queue member and they don't answer. */
-static void rna(int rnatime, struct queue_ent *qe, char *interface, char *membername)
+static void rna(int rnatime, struct queue_ent *qe, char *interface, char *membername, int pause)
 {
        ast_verb(3, "Nobody picked up in %d ms\n", rnatime);
        if (qe->parent->eventwhencalled) {
 {
        ast_verb(3, "Nobody picked up in %d ms\n", rnatime);
        if (qe->parent->eventwhencalled) {
@@ -2687,7 +2687,7 @@ static void rna(int rnatime, struct queue_ent *qe, char *interface, char *member
                                                qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
        }
        ast_queue_log(qe->parent->name, qe->chan->uniqueid, membername, "RINGNOANSWER", "%d", rnatime);
                                                qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
        }
        ast_queue_log(qe->parent->name, qe->chan->uniqueid, membername, "RINGNOANSWER", "%d", rnatime);
-       if (qe->parent->autopause) {
+       if (qe->parent->autopause && pause) {
                if (!set_member_paused(qe->parent->name, interface, "Auto-Pause", 1)) {
                        ast_verb(3, "Auto-Pausing Queue Member %s in queue %s since they failed to answer.\n", interface, qe->parent->name);
                } else {
                if (!set_member_paused(qe->parent->name, interface, "Auto-Pause", 1)) {
                        ast_verb(3, "Auto-Pausing Queue Member %s in queue %s since they failed to answer.\n", interface, qe->parent->name);
                } else {
@@ -2866,7 +2866,7 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
                                                        do_hang(o);
                                                        endtime = (long) time(NULL);
                                                        endtime -= starttime;
                                                        do_hang(o);
                                                        endtime = (long) time(NULL);
                                                        endtime -= starttime;
-                                                       rna(endtime*1000, qe, on, membername);
+                                                       rna(endtime * 1000, qe, on, membername, 0);
                                                        if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
                                                                if (qe->parent->timeoutrestart)
                                                                        *to = orig;
                                                        if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
                                                                if (qe->parent->timeoutrestart)
                                                                        *to = orig;
@@ -2880,7 +2880,7 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
                                                                ast_cdr_busy(in->cdr);
                                                        endtime = (long) time(NULL);
                                                        endtime -= starttime;
                                                                ast_cdr_busy(in->cdr);
                                                        endtime = (long) time(NULL);
                                                        endtime -= starttime;
-                                                       rna(endtime*1000, qe, on, membername);
+                                                       rna(endtime * 1000, qe, on, membername, 0);
                                                        do_hang(o);
                                                        if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
                                                                if (qe->parent->timeoutrestart)
                                                        do_hang(o);
                                                        if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
                                                                if (qe->parent->timeoutrestart)
@@ -2902,7 +2902,7 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
                                        ast_frfree(f);
                                } else {
                                        endtime = (long) time(NULL) - starttime;
                                        ast_frfree(f);
                                } else {
                                        endtime = (long) time(NULL) - starttime;
-                                       rna(endtime * 1000, qe, on, membername);
+                                       rna(endtime * 1000, qe, on, membername, 1);
                                        do_hang(o);
                                        if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
                                                if (qe->parent->timeoutrestart)
                                        do_hang(o);
                                        if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
                                                if (qe->parent->timeoutrestart)
@@ -2942,7 +2942,7 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte
                }
                if (!*to) {
                        for (o = start; o; o = o->call_next)
                }
                if (!*to) {
                        for (o = start; o; o = o->call_next)
-                               rna(orig, qe, o->interface, o->member->membername);
+                               rna(orig, qe, o->interface, o->member->membername, 1);
                }
        }
 
                }
        }