aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-15 22:08:23 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-15 22:08:23 +0000
commit665ac281142de481e757472e105460a8d0670e76 (patch)
treeaf9b856540c0ce408ec3265a493f11f8d0d87cf8
parentcb630a0bfdca5c25d2b39a0470ac940ce77e4356 (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: http://svn.digium.com/svn/asterisk/trunk@246669 f38db490-d61c-443f-a65b-d21fe96a405b
-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