app_dial: Fix incorrect device state when channel is picked up.
authorJoshua Colp <jcolp@digium.com>
Wed, 2 Nov 2016 14:15:14 +0000 (14:15 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 2 Nov 2016 14:16:41 +0000 (09:16 -0500)
Given the scenario where multiple channels are dialed using Dial()
but the caller is picked up using PickupChan() all outgoing channels
except the channel specified to PickupChan() would be marked
as ringing until the call had been hung up.

When using the PickupChan application the channel executing the
application is swapped into place of another channel. As part
of this process the channel is answered. The Dial application
has explicit logic which checks if the channel is answered,
cancels all other outgoing channels, and bridges. This logic is
different than the normal logic that is executed when an outgoing
channel is answered. This different logic failed to publish dial
events stating that the other outgoing channels had been canceled.
As a result references to the outgoing channels were held onto by
the dial masquerade process until the call had been ended and
the channels had gone away. This would result in the channels
appearing in the "core show channels" list despite not being present
anymore and would also result in incorrect device state.

This change makes it so that this logic also publishes
dial events stating that the other outgoing channels have been
canceled.

ASTERISK-26549

Change-Id: Iea7168e6e82f7d4609ec0366153804e4f55ea64f

apps/app_dial.c

index d871f7f..2f5935d 100644 (file)
@@ -1301,6 +1301,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                                }
                                        }
                                        peer = c;
+                                       publish_dial_end_event(in, out_chans, peer, "CANCEL");
                                        ast_copy_flags64(peerflags, o,
                                                OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER |
                                                OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP |