From: Mark Spencer <markster@digium.com>
Date: Tue, 31 Aug 2004 21:55:19 +0000 (+0000)
Subject: Grab each lock individually...
X-Git-Tag: 1.0.0~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c39d6de8e553baeb26841eaddb66d2079c76379;p=thirdparty%2Fasterisk.git

Grab each lock individually...


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3701 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/rtp.c b/rtp.c
index 07c022e23d..37027ecd7f 100755
--- a/rtp.c
+++ b/rtp.c
@@ -1327,7 +1327,11 @@ int ast_rtp_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, st
 	if (flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))
 		return -2;
 	ast_mutex_lock(&c0->lock);
-	ast_mutex_lock(&c1->lock);
+	while(ast_mutex_trylock(&c1->lock)) {
+		ast_mutex_unlock(&c0->lock);
+		usleep(1);
+		ast_mutex_lock(&c0->lock);
+	}
 	pr0 = get_proto(c0);
 	pr1 = get_proto(c1);
 	if (!pr0) {