From 9c70c883697d63e6f16b0b06b688a6131423c7e1 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Fri, 11 Aug 2017 16:31:45 -0500 Subject: 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 --- include/asterisk/channel.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/asterisk/channel.h') 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 -- cgit v1.2.3