laforge submitted this change.

View Change

Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve
mgw: add type selection between rtpbridge and transcoder

Hera TC MGW is an alternative MGW implementation intended for use
with OsmoMSC. Unlike standard OsmoMGW, the new MGW incorporates
speech transcoder functionality, acting as a software equivalent
of a traditional GSM TRAU. Add ability to drive this alternative
MGW, selected via new vty setting 'mgw type'.

Because Hera TC MGW includes a pass-through mode for GSM speech
codecs in addition to its primary function of TRAU-like transcoding,
a network configuration in which the MSC instance of osmo-mgw has
been replaced with hera-tc-mgw, accompanied by 'mgw type transcoder'
setting in OsmoMSC, is still a working config, although not really
useful. Instead the configuration with OsmoMSC driving Hera TC MGW
acquires useful functionality with subsequent patches in this
series, adding MNCC raw mode for operation with Hera MSC back end
components in the place of osmo-sip-connector.

Depends: I713147d6567fb30de09b2272478d717093d6170e (osmo-mgw.git)
Change-Id: I095ab75b65f57583ab7f579ba419bbfbfa686afa
Related: OS#6652
---
M TODO-RELEASE
M include/osmocom/msc/gsm_data.h
M src/libmsc/call_leg.c
M src/libmsc/msc_vty.c
M tests/test_nodes.vty
5 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/TODO-RELEASE b/TODO-RELEASE
index 0a167bd..f4b5220 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -10,3 +10,4 @@
libosmo-sigtran >2.3.0 OSMO_SCCP_REL_REASON_NSU_*
libosmo-sigtran >2.3.0 OSMO_SCCP_RETURN_REASON_*, osmo_sccp_return_reason_name()
libosmo-mgcp-client >1.16.0 x_side[] in struct mgcp_conn_peer
+libosmo-mgcp-client >1.16.0 mgcp_client_transcoder_wildcard()
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index f1537ff..928eeca 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -283,6 +283,13 @@
*/
uint8_t tw_rtp_formats;

+ /* OsmoMSC requires an associated MGCP-speaking MGW, but it can now be
+ * one of two types: either rtpbridge (standard OsmoMGW) or transcoder
+ * (Themyscira Wireless add-ons to Osmocom CNI suite). The selection
+ * is configured via vty.
+ */
+ bool use_transcoder_mgw;
+
/* Should we send X-Side extension parameter line to our attached MGW,
* telling it which CRCX is for CN vs RAN? */
bool mgw_indicate_side;
diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c
index 7402c5a..7b81008 100644
--- a/src/libmsc/call_leg.c
+++ b/src/libmsc/call_leg.c
@@ -291,14 +291,20 @@

if (!cl->mgw_endpoint) {
struct mgcp_client *mgcp_client = mgcp_client_pool_get(gsmnet->mgw.mgw_pool);
+ const char *mgw_wildcard;
+
if (!mgcp_client) {
LOG_CALL_LEG(cl, LOGL_ERROR,
"cannot ensure MGW endpoint -- no MGW configured, check configuration!\n");
return -ENODEV;
}
+ if (gsmnet->use_transcoder_mgw)
+ mgw_wildcard = mgcp_client_transcoder_wildcard(mgcp_client);
+ else
+ mgw_wildcard = mgcp_client_rtpbridge_wildcard(mgcp_client);
cl->mgw_endpoint = osmo_mgcpc_ep_alloc(cl->fi, CALL_LEG_EV_MGW_ENDPOINT_GONE,
mgcp_client, gsmnet->mgw.tdefs, cl->fi->id,
- "%s", mgcp_client_rtpbridge_wildcard(mgcp_client));
+ "%s", mgw_wildcard);
}
if (!cl->mgw_endpoint) {
LOG_CALL_LEG(cl, LOGL_ERROR, "failed to setup MGW endpoint\n");
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 895bd7e..2c873f6 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -726,6 +726,17 @@

#define MGW_STR MGCP_CLIENT_MGW_STR

+DEFUN(cfg_msc_mgw_type,
+ cfg_msc_mgw_type_cmd,
+ "mgw type (rtpbridge|transcoder)",
+ MGW_STR "Type of Media Gateway to be used\n"
+ "Symmetric RTP bridge (Osmocom standard)\n"
+ "Asymmetric transcoding MGW\n")
+{
+ gsmnet->use_transcoder_mgw = (strcmp(argv[0], "transcoder") == 0);
+ return CMD_SUCCESS;
+}
+
DEFUN(cfg_msc_mgw_side,
cfg_msc_mgw_side_cmd,
"mgw indicate-side",
@@ -883,6 +894,8 @@
vty_out(vty, "%s", VTY_NEWLINE);
}

+ if (gsmnet->use_transcoder_mgw)
+ vty_out(vty, " mgw type transcoder%s", VTY_NEWLINE);
if (gsmnet->mgw_indicate_side)
vty_out(vty, " mgw indicate-side%s", VTY_NEWLINE);

@@ -2186,6 +2199,7 @@
install_element(MSC_NODE, &cfg_msc_osmux_cmd);
install_element(MSC_NODE, &cfg_msc_twformat_cmd);
install_element(MSC_NODE, &cfg_msc_no_twformat_cmd);
+ install_element(MSC_NODE, &cfg_msc_mgw_type_cmd);
install_element(MSC_NODE, &cfg_msc_mgw_side_cmd);
install_element(MSC_NODE, &cfg_msc_no_mgw_side_cmd);
install_element(MSC_NODE, &cfg_msc_handover_number_range_cmd);
diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty
index 109ec9d..f95dcc6 100644
--- a/tests/test_nodes.vty
+++ b/tests/test_nodes.vty
@@ -69,6 +69,7 @@
osmux (on|off|only)
tw-rtp-formats (fr|hr|amr|csd) [(fr|hr|amr|csd)] [(fr|hr|amr|csd)] [(fr|hr|amr|csd)]
no tw-rtp-formats
+ mgw type (rtpbridge|transcoder)
mgw indicate-side
no mgw indicate-side
handover-number range MSISDN_FIRST MSISDN_LAST

To view, visit change 44002. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I095ab75b65f57583ab7f579ba419bbfbfa686afa
Gerrit-Change-Number: 44002
Gerrit-PatchSet: 5
Gerrit-Owner: falconia <falcon@freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>