X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinpbx.cpp;h=71e7e1cbfe2ebda134c07b57d434a3d1bf213308;hp=5d88fa232b8341121b467b143e00a2bc55269376;hb=refs%2Fheads%2Fbackup2;hpb=fa1f601f49879958ac9fc698b044012c772ec7da

diff --git a/joinpbx.cpp b/joinpbx.cpp
index 5d88fa2..71e7e1c 100644
--- a/joinpbx.cpp
+++ b/joinpbx.cpp
@@ -358,6 +358,17 @@ void JoinPBX::bridge(void)
 			relation = relation->next;
 			continue;
 		}
+#ifdef WITH_VOOTP
+		if (port->p_vootp) {
+			PDEBUG(DEBUG_JOIN, "join%d ignoring relation ep%d because it's port uses VoOTP.\n", j_serial, epoint->ep_serial);
+			if (allmISDN) {
+				PDEBUG(DEBUG_JOIN, "join%d not all endpoints can support mISDN bridging.\n", j_serial);
+				allmISDN = 0;
+			}
+			relation = relation->next;
+			continue;
+		}
+#endif
 
 		relation = relation->next;
 	}
@@ -412,6 +423,17 @@ no need to count, because j_3pty is taken into account below when checking relat
 				relation = relation->next;
 				continue;
 			}
+#ifdef WITH_VOOTP
+			if (port->p_vootp) {
+				PDEBUG(DEBUG_JOIN, "join%d ignoring relation ep%d because it's port uses VoOTP.\n", joinpbx_3pty->j_serial, epoint->ep_serial);
+				if (allmISDN) {
+					PDEBUG(DEBUG_JOIN, "join%d not all endpoints can support mISDN bridging.\n", joinpbx_3pty->j_serial);
+					allmISDN = 0;
+				}
+				relation = relation->next;
+				continue;
+			}
+#endif
 
 			relation = relation->next;
 		}
@@ -807,6 +829,11 @@ void JoinPBX::message_epoint(unsigned int epoint_id, int message_type, union par
 		}
 		return;
 
+		case MESSAGE_UPDATEBRIDGE:
+			trigger_work(&j_updatebridge);
+			joinpbx_debug(this, "Join::message_epoint{bridge is updated due to request from mISDN port}");
+			break;
+
 		/* track notify */
 		case MESSAGE_NOTIFY:
 		switch(param->notifyinfo.notify) {