]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
app_queue: Ensure member is removed from pending when hanging up. 44/3744/1
authorJoshua Colp <jcolp@digium.com>
Thu, 25 Aug 2016 12:06:41 +0000 (12:06 +0000)
committerJoshua Colp <jcolp@digium.com>
Sat, 27 Aug 2016 10:21:58 +0000 (05:21 -0500)
When dialing channels it is possible that they may not ever
leave the not in use state (Local channels in particular) by
the time we cancel them. If this occurs but we know they were
dialed we explicitly remove them from the pending members
container so that subsequent call attempts occur.

ASTERISK-26299 #close

Change-Id: I6ad0d17c36480c92cebf840626228ce3f7e4bd65

apps/app_queue.c

index a5cb126402718001b30aefe7cd40771ccb5d7613..f9dd86b677be334f4707474af4a4405c96f17826 100644 (file)
@@ -4102,6 +4102,17 @@ static void hangupcalls(struct queue_ent *qe, struct callattempt *outgoing, stru
                                ast_channel_hangupcause_set(outgoing->chan, AST_CAUSE_ANSWERED_ELSEWHERE);
                        }
                        ast_channel_publish_dial(qe->chan, outgoing->chan, outgoing->interface, "CANCEL");
+
+                       /* When dialing channels it is possible that they may not ever
+                        * leave the not in use state (Local channels in particular) by
+                        * the time we cancel them. If this occurs but we know they were
+                        * dialed we explicitly remove them from the pending members
+                        * container so that subsequent call attempts occur.
+                        */
+                       if (outgoing->member->status == AST_DEVICE_NOT_INUSE) {
+                               pending_members_remove(outgoing->member);
+                       }
+
                        ast_hangup(outgoing->chan);
                }
                oo = outgoing;