summaryrefslogtreecommitdiff
path: root/include/asterisk/channel.h
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2017-08-11 16:31:45 -0500
committerRichard Mudgett <rmudgett@digium.com>2017-08-22 11:59:49 -0500
commit9c70c883697d63e6f16b0b06b688a6131423c7e1 (patch)
tree9993f85fd8ae520f7942479b42f5d0759b4073e3 /include/asterisk/channel.h
parentc86619bab87d348cbcd2f3378e4b68c8cb20090b (diff)
channel: Fix topology API locking.
* ast_channel_request_stream_topology_change() must not be called with any channel locks held. * ast_channel_stream_topology_changed() must be called with only the passed channel lock held. ASTERISK-27212 Change-Id: I843de7956d9f1cc7cc02025aea3463d8fe19c691
Diffstat (limited to 'include/asterisk/channel.h')
-rw-r--r--include/asterisk/channel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index f0fe5b212..3dfbe61d9 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -4934,7 +4934,7 @@ int ast_channel_is_multistream(struct ast_channel *chan);
* \param topology The new stream topology
* \param change_source The source that initiated the change
*
- * \pre chan is locked
+ * \note Absolutely _NO_ channel locks should be held before calling this function.
*
* \retval 0 request has been accepted to be attempted
* \retval -1 request could not be attempted
@@ -4956,7 +4956,7 @@ int ast_channel_request_stream_topology_change(struct ast_channel *chan,
* \param chan The channel to provide notice to
* \param topology The new stream topology
*
- * \pre chan is locked
+ * \pre chan is locked Absolutely _NO_ other channels can be locked.
*
* \retval 0 success
* \retval -1 failure