Restore triedtopribridge flag code removed in -r211197.
authorRichard Mudgett <rmudgett@digium.com>
Mon, 15 Feb 2010 22:08:23 +0000 (22:08 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 15 Feb 2010 22:08:23 +0000 (22:08 +0000)
Ooops.  Failed to note that we were inside a for loop and
pri_channel_bridge() needs to be executed only once.

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

channels/chan_dahdi.c

index 890fc68..aadee12 100644 (file)
@@ -6391,6 +6391,7 @@ static enum ast_bridge_result dahdi_bridge(struct ast_channel *c0, struct ast_ch
        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 @@ static enum ast_bridge_result dahdi_bridge(struct ast_channel *c0, struct ast_ch
                        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