<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14038">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: Add option to enable osmux towards BSCs<br><br>Change-Id: I6de1be0322ddbdc115074ebb6be2598ebf6c95db<br>---<br>M include/osmocom/msc/Makefile.am<br>M include/osmocom/msc/gsm_data.h<br>A include/osmocom/msc/osmux.h<br>M src/libmsc/msc_vty.c<br>M tests/test_nodes.vty<br>5 files changed, 40 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am</span><br><span>index 9ca4c38..0d7d45c 100644</span><br><span>--- a/include/osmocom/msc/Makefile.am</span><br><span>+++ b/include/osmocom/msc/Makefile.am</span><br><span>@@ -28,6 +28,7 @@</span><br><span> msc_t_remote.h \</span><br><span> msub.h \</span><br><span> neighbor_ident.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux.h \</span><br><span> paging.h \</span><br><span> ran_conn.h \</span><br><span> ran_infra.h \</span><br><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 42bb69a..f6e3ed9 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -19,6 +19,7 @@</span><br><span> #include <osmocom/msc/neighbor_ident.h></span><br><span> </span><br><span> #include "gsm_data_shared.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "osmux.h"</span><br><span> </span><br><span> /** annotations for msgb ownership */</span><br><span> #define __uses</span><br><span>@@ -231,6 +232,9 @@</span><br><span> uint64_t range_end;</span><br><span> uint64_t next;</span><br><span> } handover_number;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Whether we want to use Osmux against BSCs. Controlled via VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmux_usage use_osmux;</span><br><span> };</span><br><span> </span><br><span> struct osmo_esme;</span><br><span>diff --git a/include/osmocom/msc/osmux.h b/include/osmocom/msc/osmux.h</span><br><span>new file mode 100644</span><br><span>index 0000000..7af32fc</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/msc/osmux.h</span><br><span>@@ -0,0 +1,11 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum osmux_usage {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* MSC won't use Osmux in call legs towards its RAN */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMUX_USAGE_OFF = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* MSC will use Osmux in call legs towards RAN as long as RAN announced support for it */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMUX_USAGE_ON = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* MSC will always use Osmux in call legs towards its RAN, and will</span><br><span style="color: hsl(120, 100%, 40%);">+ reject calls for RANs which didn't announce support for it */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMUX_USAGE_ONLY = 2,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index 5c58221..0c07bc2 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -59,6 +59,7 @@</span><br><span> #include <osmocom/msc/gsm_04_14.h></span><br><span> #include <osmocom/msc/signal.h></span><br><span> #include <osmocom/msc/mncc_int.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/osmux.h></span><br><span> #include <osmocom/msc/rrlp.h></span><br><span> #include <osmocom/msc/vlr_sgs.h></span><br><span> #include <osmocom/msc/sgs_vty.h></span><br><span>@@ -565,6 +566,22 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMUX_STR "RTP multiplexing\n"</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_msc_osmux,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_msc_osmux_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "osmux (on|off|only)",</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMUX_STR "Enable OSMUX\n" "Disable OSMUX\n" "Only use OSMUX\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(argv[0], "off") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmnet->use_osmux = OSMUX_USAGE_OFF;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (strcmp(argv[0], "on") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmnet->use_osmux = OSMUX_USAGE_ON;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (strcmp(argv[0], "only") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmnet->use_osmux = OSMUX_USAGE_ONLY;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int config_write_msc(struct vty *vty)</span><br><span> {</span><br><span> vty_out(vty, "msc%s", VTY_NEWLINE);</span><br><span>@@ -615,6 +632,11 @@</span><br><span> gsmnet->handover_number.range_start, gsmnet->handover_number.range_end,</span><br><span> VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsmnet->use_osmux != OSMUX_USAGE_OFF) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux %s%s", gsmnet->use_osmux == OSMUX_USAGE_ON ? "on" : "only",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mgcp_client_config_write(vty, " ");</span><br><span> #ifdef BUILD_IU</span><br><span> ranap_iu_vty_config_write(vty, " ");</span><br><span>@@ -1757,6 +1779,7 @@</span><br><span> install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_sms_over_gsup_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_no_sms_over_gsup_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_osmux_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_handover_number_range_cmd);</span><br><span> </span><br><span> neighbor_ident_vty_init(msc_network);</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index cdb3f8a..fb7b1c5 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -45,6 +45,7 @@</span><br><span> emergency-call route-to-msisdn MSISDN</span><br><span> sms-over-gsup</span><br><span> no sms-over-gsup</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux (on|off|only)</span><br><span> handover-number range MSISDN_FIRST MSISDN_LAST</span><br><span> neighbor (a|iu) lac <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME</span><br><span> neighbor (a|iu) lac-ci <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14038">change 14038</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/14038"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6de1be0322ddbdc115074ebb6be2598ebf6c95db </div>
<div style="display:none"> Gerrit-Change-Number: 14038 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>