From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 6 Apr 2010 00:46:14 +0000 (+0000)
Subject: Merged revisions 256265 via svnmerge from
X-Git-Tag: 1.6.0.28-rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53126af77de4d359e4945510fcb59342061b175c;p=thirdparty%2Fasterisk.git

Merged revisions 256265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r256265 | rmudgett | 2010-04-05 19:39:44 -0500 (Mon, 05 Apr 2010) | 12 lines

  Merged revisions 256225 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r256225 | rmudgett | 2010-04-05 19:10:16 -0500 (Mon, 05 Apr 2010) | 5 lines

    DAHDI/PRI call to pri_channel_bridge() not protected by PRI lock.

    SWP-1231
    ABE-2163
  ........
................


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

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index e5adb979b2..4c9ea5cdaf 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -4146,7 +4146,6 @@ static enum ast_bridge_result dahdi_bridge(struct ast_channel *c0, struct ast_ch
 
 #ifdef PRI_2BCT
 	int triedtopribridge = 0;
-	q931_call *q931c0 = NULL, *q931c1 = NULL;
 #endif
 
 	/* For now, don't attempt to native bridge if either channel needs DTMF detection.
@@ -4367,13 +4366,15 @@ static enum ast_bridge_result dahdi_bridge(struct ast_channel *c0, struct ast_ch
 		}
 
 #ifdef PRI_2BCT
-		q931c0 = p0->call;
-		q931c1 = p1->call;
-		if (p0->transfer && p1->transfer 
-		    && q931c0 && q931c1 
-		    && !triedtopribridge) {
-			pri_channel_bridge(q931c0, q931c1);
+		if (!triedtopribridge) {
 			triedtopribridge = 1;
+			if (p0->pri && p0->pri == p1->pri && p0->transfer && p1->transfer) {
+				ast_mutex_lock(&p0->pri->lock);
+				if (p0->call && p1->call) {
+					pri_channel_bridge(p0->call, p1->call);
+				}
+				ast_mutex_unlock(&p0->pri->lock);
+			}
 		}
 #endif