From f69f5cd3c43025180b61a20cc1aa906c9cf7f4f4 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 25 Aug 2016 12:06:41 +0000 Subject: app_queue: Ensure member is removed from pending when hanging up. 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 | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'apps') diff --git a/apps/app_queue.c b/apps/app_queue.c index e04942f68..9b283d467 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -4077,6 +4077,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; -- cgit v1.2.3