From 28c0cb28d0815e5e59ab99b60ac6b50e1ed9cbae Mon Sep 17 00:00:00 2001 From: Kevin Harwell Date: Wed, 18 Dec 2013 20:33:37 +0000 Subject: channel locking: Add locking for channel snapshot creation Original commit message by mmichelson (asterisk 12 r403311): "This adds channel locks around calls to create channel snapshots as well as other functions which operate on a channel and then end up creating a channel snapshot. Functions that expect the channel to be locked prior to being called have had their documentation updated to indicate such." The above was initially committed and then reverted at r403398. The problem was found to be in core_local.c in the publish_local_bridge_message function. The ast_unreal_lock_all function locks and adds a reference to the returned channels and while they were being unlocked they were not being unreffed when no longer needed. Fixed by unreffing the channels. Also in bridge.c a lock was obtained on "other->chan", but then an attempt was made to unlock "other" and not the previously locked channel. Fixed by unlocking "other->chan" (closes issue ASTERISK-22709) Reported by: John Bigelow ........ Merged revisions 404237 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404260 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/channelstate.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/asterisk/channelstate.h') diff --git a/include/asterisk/channelstate.h b/include/asterisk/channelstate.h index f5f7392dd..08f908256 100644 --- a/include/asterisk/channelstate.h +++ b/include/asterisk/channelstate.h @@ -47,7 +47,10 @@ enum ast_channel_state { AST_STATE_MUTE = (1 << 16), /*!< Do not transmit voice data */ }; -/*! \brief Change the state of a channel */ +/*! + * \brief Change the state of a channel + * \pre chan is locked + */ int ast_setstate(struct ast_channel *chan, enum ast_channel_state); #endif /* __AST_CHANNELSTATE_H__ */ -- cgit v1.2.3