diff options
author | Joshua Colp <jcolp@digium.com> | 2016-08-25 12:06:41 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2016-08-25 22:54:51 +0000 |
commit | f69f5cd3c43025180b61a20cc1aa906c9cf7f4f4 (patch) | |
tree | b69234c6f05f5432eaa38b069e3d01aa01e4602e /apps | |
parent | 4e5b930d3fa11012513a1ba37d2cf7c0068b6407 (diff) |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_queue.c | 11 |
1 files changed, 11 insertions, 0 deletions
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; |