Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv4376/channels
Modified Files:
chan_zap.c
Log Message:
Fix PRI against masquerade
Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -d -r1.486 -r1.487
--- chan_zap.c 11 Aug 2005 16:43:36 -0000 1.486
+++ chan_zap.c 15 Aug 2005 14:57:58 -0000 1.487
@@ -2992,17 +2992,6 @@
p0 = c0->tech_pvt;
p1 = c1->tech_pvt;
-#ifdef PRI_2BCT
- q931c0 = p0->call;
- q931c1 = p1->call;
- if (p0->transfer && p1->transfer
- && q931c0 && q931c1
- && !triedtopribridge) {
- pri_channel_bridge(q931c0, q931c1);
- triedtopribridge = 1;
- }
-#endif
-
if (op0 == p0)
i0 = zt_get_index(c0, p0, 1);
if (op1 == p1)
@@ -3027,6 +3016,18 @@
res = AST_BRIDGE_RETRY;
goto return_from_bridge;
}
+
+#ifdef PRI_2BCT
+ q931c0 = p0->call;
+ q931c1 = p1->call;
+ if (p0->transfer && p1->transfer
+ && q931c0 && q931c1
+ && !triedtopribridge) {
+ pri_channel_bridge(q931c0, q931c1);
+ triedtopribridge = 1;
+ }
+#endif
+
to = -1;
who = ast_waitfor_n(priority ? c0_priority : c1_priority, 2,
&to);
if (!who) {
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
