Change in osmo-bsc[master]: Ask mgw to use osmux when requested by MSC

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/13926


Change subject: Ask mgw to use osmux when requested by MSC
......................................................................

Ask mgw to use osmux when requested by MSC

Change-Id: I4156a4e2fb7ce1b896779b50e4d3481281b43e55
---
M src/osmo-bsc/bsc_subscr_conn_fsm.c
1 file changed, 9 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/13926/1

diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index f944431..3fc9a5c 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -460,11 +460,13 @@
 struct osmo_mgcpc_ep *gscon_ensure_mgw_endpoint(struct gsm_subscriber_connection *conn,
 						uint16_t msc_assigned_cic)
 {
+	const char* name;
 	if (conn->user_plane.mgw_endpoint)
 		return conn->user_plane.mgw_endpoint;
 
 	if (gscon_is_sccplite(conn)) {
 		/* derive endpoint name from CIC on A interface side */
+		/* TODO: implement osmux for SCCPlite */
 		conn->user_plane.mgw_endpoint =
 			osmo_mgcpc_ep_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,
 					    conn->network->mgw.client,
@@ -477,12 +479,16 @@
 
 	} else if (gscon_is_aoip(conn)) {
 		/* use dynamic RTPBRIDGE endpoint allocation in MGW */
+		//if (conn->assignment.req.use_osmux)
+		//	name = mgcp_client_osmuxbridge_wildcard(conn->network->mgw.client);
+		//else
+			name = mgcp_client_rtpbridge_wildcard(conn->network->mgw.client);
 		conn->user_plane.mgw_endpoint =
 			osmo_mgcpc_ep_alloc(conn->fi, GSCON_EV_FORGET_MGW_ENDPOINT,
 					    conn->network->mgw.client,
 					    conn->network->mgw.tdefs,
 					    conn->fi->id,
-					    "%s", mgcp_client_rtpbridge_wildcard(conn->network->mgw.client));
+					    "%s", name);
 	} else {
 		LOGPFSML(conn->fi, LOGL_ERROR, "Conn is neither SCCPlite nor AoIP!?\n");
 		return NULL;
@@ -519,6 +525,8 @@
 		.port = port,
 		.call_id = conn->sccp.conn_id,
 		.ptime = 20,
+		.x_osmo_osmux_use = conn->assignment.req.use_osmux,
+		.x_osmo_osmux_cid = conn->assignment.req.osmux_cid,
 	};
 	mgcp_pick_codec(&mgw_info, for_lchan, false);
 

-- 
To view, visit https://gerrit.osmocom.org/13926
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4156a4e2fb7ce1b896779b50e4d3481281b43e55
Gerrit-Change-Number: 13926
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190508/62dcb77c/attachment.htm>