summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2010-02-15 22:08:23 +0000
committerRichard Mudgett <rmudgett@digium.com>2010-02-15 22:08:23 +0000
commitb2a1ad7946578de4395e86d6855c179d7e938119 (patch)
treeaf9b856540c0ce408ec3265a493f11f8d0d87cf8
parent94fd355eff69437a3bbe508caaad0f1ed8b22fac (diff)
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. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@246669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_dahdi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 890fc6839..aadee12b4 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -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