summaryrefslogtreecommitdiff
path: root/include/asterisk/channel.h
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-04-30 21:40:16 +0000
committerJoshua Colp <jcolp@digium.com>2017-05-04 16:40:04 -0500
commitc90d81ef5195c71db81ed69782d84ab357787516 (patch)
tree7c71b96d4f31bd93c9d738876d057627e1f92fb0 /include/asterisk/channel.h
parent7b0e3b92fd49e5fbe406ef74336e164eb3f31b6e (diff)
bridge: Fix returning to dialplan when executing Bridge() from AMI.
When using the Bridge AMI action on the same channel multiple times it was possible for the channel to return to the wrong location in the dialplan if the other party hung up. This happened because the priority of the channel was not preserved across each action invocation and it would fail to move on to the next priority in other cases. This change makes it so that the priority of a channel is preserved when taking control of it from another thread and it is incremented as appropriate such that the priority reflects where the channel should next be executed in the dialplan, not where it may or may not currently be. The Bridge AMI action was also changed to ensure that it too starts the channels at the next location in the dialplan. ASTERISK-24529 Change-Id: I52406669cf64208aef7252a65b63ade31fbf7a5a
Diffstat (limited to 'include/asterisk/channel.h')
-rw-r--r--include/asterisk/channel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 889d3ff07..fd339d974 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -4640,6 +4640,9 @@ struct ast_bridge_channel *ast_channel_get_bridge_channel(struct ast_channel *ch
*
* \note absolutely _NO_ channel locks should be held before calling this function.
*
+ * \note The dialplan location on the returned channel is where the channel
+ * should be started in the dialplan if it is returned to it.
+ *
* \param yankee The channel to gain control of
* \retval NULL Could not gain control of the channel
* \retval non-NULL The channel