[Asterisk-cvs] asterisk rtp.c,1.88,1.89

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv1494

Modified Files:
	rtp.c 
Log Message:
Grab each lock individually...


Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- rtp.c	31 Aug 2004 14:03:18 -0000	1.88
+++ rtp.c	31 Aug 2004 21:55:19 -0000	1.89
@@ -1327,7 +1327,11 @@
 	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) {