[asterisk-commits] rmudgett: trunk r246669 - /trunk/channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Feb 15 16:08:23 2010
New Revision: 246669

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=246669
Log:
Restore triedtopribridge flag code removed in -r211197.

Ooops.  Failed to note that we were inside a for loop and
pri_channel_bridge() needs to be executed only once.

Modified:
    trunk/channels/chan_dahdi.c

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=246669&r1=246668&r2=246669
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Mon Feb 15 16:08:23 2010
@@ -6391,6 +6391,7 @@
 	struct ast_channel *oc0, *oc1;
 	enum ast_bridge_result res;
 #ifdef PRI_2BCT
+	int triedtopribridge = 0;
 	q931_call *q931c0;
 	q931_call *q931c1;
 #endif
@@ -6642,7 +6643,8 @@
 			q931c1 = NULL;
 			break;
 		}
-		if (q931c0 && q931c1 && p0->transfer && p1->transfer) {
+		if (q931c0 && q931c1 && p0->transfer && p1->transfer && !triedtopribridge) {
+			triedtopribridge = 1;
 			pri_channel_bridge(q931c0, q931c1);
 		}
 #endif