kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

bridge_native_rtp: Deadlock during 4-way conference creation

Browse Source 
The change contains a slightly adjusted patch that was on the issue
(submitted by kmoore).  A fix was made by adding in a bridge lock
while calling bridge_start/stop from the framehook callback.  Since
the framehook callback is not called from the bridging core the bridge
is not locked, but needs to be before calling bridge_start.

(closes issue ASTERISK-22749)
Reported by: Kinsey Moore
Review: https://reviewboard.asterisk.org/r/3066/
Patches:
     lock_inversion.diff uploaded by kmoore (license 6273)
........

Merged revisions 403767 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403768 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin Harwell
2013-12-13 18:33:25 +00:00
parent f425c4a086
commit 84e1790beb
5 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/channel.h
View File

@@ -4214,6 +4214,8 @@ int ast_channel_is_bridged(const struct ast_channel *chan);
* \note The returned peer channel is the current peer in the
* bridge when called.
*
* \note Absolutely _NO_ channel locks should be held when calling this function.
*
* \retval NULL Channel not in a bridge or the bridge is not two-party.
* \retval non-NULL Reffed peer channel at time of calling.
*/