bridge calls via mgcpgw

Change-Id: Ie259e30bc532fe9817c96562022ac33443d5747a

2 files changed, 30 insertions, 2 deletions

diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index 7059cb3dd..4b42c994b 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -1766,8 +1766,7 @@ static int tch_bridge(struct gsm_network *net, struct gsm_mncc_bridge *bridge)
 	/* through-connect channel */
 	return tch_map(trans1->conn->lchan, trans2->conn->lchan);
 #else
-	/* not implemented yet! */
-	return -1;
+	return msc_call_bridge(trans1, trans2);
 #endif
 }
 
diff --git a/openbsc/src/libmsc/msc_ifaces.c b/openbsc/src/libmsc/msc_ifaces.c
index 2937b54f6..585927c73 100644
--- a/openbsc/src/libmsc/msc_ifaces.c
+++ b/openbsc/src/libmsc/msc_ifaces.c
@@ -186,3 +186,32 @@ int msc_call_assignment(struct gsm_trans *trans)
 		return -EINVAL;
 	}
 }
+
+int msc_call_bridge(struct gsm_trans *trans1, struct gsm_trans *trans2)
+{
+	struct gsm_subscriber_connection *conn1 = trans1->conn;
+	struct gsm_subscriber_connection *conn2 = trans2->conn;
+
+	struct mgcpgw_client *mgcp = conn1->network->mgcpgw.client;
+	OSMO_ASSERT(mgcp);
+
+	const char *ip = mgcpgw_client_remote_addr_str(mgcp);
+
+	/* First setup the counterparts' endpoints, so that when transmission
+	 * starts the originating addresses are already known to be valid. */
+	mgcpgw_client_tx_mdcx(mgcp, conn1->iu.mgcp_rtp_endpoint,
+			      ip, conn2->iu.mgcp_rtp_port_cn,
+			      MGCP_CONN_LOOPBACK);
+	mgcpgw_client_tx_mdcx(mgcp, conn2->iu.mgcp_rtp_endpoint,
+			      ip, conn1->iu.mgcp_rtp_port_cn,
+			      MGCP_CONN_LOOPBACK);
+	/* Now enable sending to and receiving from the peer. */
+	mgcpgw_client_tx_mdcx(mgcp, conn1->iu.mgcp_rtp_endpoint,
+			      ip, conn2->iu.mgcp_rtp_port_cn,
+			      MGCP_CONN_RECV_SEND);
+	mgcpgw_client_tx_mdcx(mgcp, conn2->iu.mgcp_rtp_endpoint,
+			      ip, conn1->iu.mgcp_rtp_port_cn,
+			      MGCP_CONN_RECV_SEND);
+
+	return 0;
+}