<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13922">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: Add option to enable osmux towards MSC<br><br>Change-Id: I30c485c022f2d55e0a004f69b2503da7f91ecb74<br>---<br>M include/osmocom/bsc/Makefile.am<br>M include/osmocom/bsc/bsc_msc_data.h<br>A include/osmocom/bsc/osmux.h<br>M src/osmo-bsc/osmo_bsc_vty.c<br>4 files changed, 36 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/13922/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am</span><br><span>index 89323c0..f44e7fc 100644</span><br><span>--- a/include/osmocom/bsc/Makefile.am</span><br><span>+++ b/include/osmocom/bsc/Makefile.am</span><br><span>@@ -41,6 +41,7 @@</span><br><span> osmo_bsc_rf.h \</span><br><span> osmo_bsc_sigtran.h \</span><br><span> bsc_msc_data.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux.h \</span><br><span> paging.h \</span><br><span> pcu_if.h \</span><br><span> pcuif_proto.h \</span><br><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index debd240..271bdd4 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -30,6 +30,7 @@</span><br><span> </span><br><span> #include "debug.h"</span><br><span> #include "osmo_bsc_lcls.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "osmux.h"</span><br><span> </span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span>@@ -129,6 +130,9 @@</span><br><span> </span><br><span> uint32_t x_osmo_ign;</span><br><span> bool x_osmo_ign_configured;</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 this MSC. 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> /*</span><br><span>diff --git a/include/osmocom/bsc/osmux.h b/include/osmocom/bsc/osmux.h</span><br><span>new file mode 100644</span><br><span>index 0000000..aa3d1ab</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/bsc/osmux.h</span><br><span>@@ -0,0 +1,7 @@</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%);">+ OSMUX_USAGE_OFF = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMUX_USAGE_ON = 1,</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/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>index 78196cf..4591ad1 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <osmocom/bsc/bsc_subscriber.h></span><br><span> #include <osmocom/bsc/debug.h></span><br><span> #include <osmocom/bsc/bsc_msg_filter.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/osmux.h></span><br><span> </span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span>@@ -197,6 +198,11 @@</span><br><span> else</span><br><span> vty_out(vty, " mgw x-osmo-ign call-id%s", VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msc->use_osmux != OSMUX_USAGE_OFF) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux %s%s", msc->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> }</span><br><span> </span><br><span> static int config_write_msc(struct vty *vty)</span><br><span>@@ -708,6 +714,23 @@</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%);">+ struct bsc_msc_data *msc = bsc_msc_data(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(argv[0], "off") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->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%);">+ msc->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%);">+ msc->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> DEFUN(cfg_net_bsc_mid_call_text,</span><br><span> cfg_net_bsc_mid_call_text_cmd,</span><br><span> "mid-call-text .TEXT",</span><br><span>@@ -1045,6 +1068,7 @@</span><br><span> mgcp_client_vty_init(net, MSC_NODE, net->mgw.conf);</span><br><span> install_element(MSC_NODE, &cfg_msc_mgw_x_osmo_ign_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_no_mgw_x_osmo_ign_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_osmux_cmd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13922">change 13922</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/13922"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I30c485c022f2d55e0a004f69b2503da7f91ecb74 </div>
<div style="display:none"> Gerrit-Change-Number: 13922 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>