diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-01-09 20:56:23 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-01-09 20:56:23 +0000 |
| commit | 671499c8b26568aa01fe385da7645880969fd1a6 (patch) | |
| tree | 261a6655ec149b9c3c7a7f2f1094110ef023a056 /main/udptl.c | |
| parent | 6dfcc86c0d5fa6f685b80067a6ee894ae3058bb5 (diff) | |
* Found some more places to use ast_channel_lock_both().
* Minor optimization in ast_rtp_instance_early_bridge().
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/udptl.c')
| -rw-r--r-- | main/udptl.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/main/udptl.c b/main/udptl.c index bc96790fd..37f04d530 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -1206,12 +1206,7 @@ int ast_udptl_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, void *pvt1; int to; - ast_channel_lock(c0); - while (ast_channel_trylock(c1)) { - ast_channel_unlock(c0); - usleep(1); - ast_channel_lock(c0); - } + ast_channel_lock_both(c0, c1); pr0 = get_proto(c0); pr1 = get_proto(c1); if (!pr0) { |