kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-16 09:46:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 84049 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84049 | tilghman | 2007-09-28 00:30:22 -0500 (Fri, 28 Sep 2007) | 3 lines

Avoid a deadlock with ALL of the locks in the masquerade function, not just the
pairs of channels.  (Closes issue #10406)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-09-28 05:37:16 +00:00
parent bd5b6cea68
commit d3904a21c4
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/channel.c
View File

@@ -3333,7 +3333,11 @@ int ast_channel_make_compatible(struct ast_channel *chan, struct ast_channel *pe
int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clone)
{
int res = -1;
struct ast_channel *final_orig = original, *final_clone = clone;
struct ast_channel *final_orig, *final_clone;
retrymasq:
final_orig = original;
final_clone = clone;
ast_channel_lock(original);
while (ast_channel_trylock(clone)) {
@@ -3351,11 +3355,19 @@ int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clo
final_clone = clone->_bridge;
if ((final_orig != original) || (final_clone != clone)) {
ast_channel_lock(final_orig);
while (ast_channel_trylock(final_clone)) {
/* Lots and lots of deadlock avoidance. The main one we're competing with
* is ast_write(), which locks channels recursively, when working with a
* proxy channel. */
if (ast_channel_trylock(final_orig)) {
ast_channel_unlock(clone);
ast_channel_unlock(original);
goto retrymasq;
}
if (ast_channel_trylock(final_clone)) {
ast_channel_unlock(final_orig);
usleep(1);
ast_channel_lock(final_orig);
ast_channel_unlock(clone);
ast_channel_unlock(original);
goto retrymasq;
}
ast_channel_unlock(clone);
ast_channel_unlock(original);