* 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
This commit is contained in:
Richard Mudgett
2013-01-09 20:56:23 +00:00
parent 6dfcc86c0d
commit 671499c8b2
2 changed files with 9 additions and 31 deletions

View File

@@ -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) {