diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-28 05:37:16 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-28 05:37:16 +0000 |
| commit | 3fdc6e41c7d59e472e3b80c98ce88f4cce6b9c7c (patch) | |
| tree | c56888e19bba837864758f7785af1ee08c5e9d0e /main/channel.c | |
| parent | c2fe27f94a9ff2b308a4a0684685a72300001614 (diff) | |
Merged revisions 84049 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@84050 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/channel.c')
| -rw-r--r-- | main/channel.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/main/channel.c b/main/channel.c index d8a137ec0..e11afe9d4 100644 --- a/main/channel.c +++ b/main/channel.c @@ -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); |