<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/16932">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">VTY: add osmo_tdef introspection and configuration commands<br><br>This change introduces several new VTY commands letting the user<br>a possibility to introspect and reconfigure some of the existing<br>timers implemented using libosmocore's osmo_tdef API.<br><br>At the moment this covers the following timers:<br><br> - MGW specific timers:<br> - X1 - MGCP response timeout,<br> - X2 - RTP stream establishing timeout,<br><br> - RAN specific timers (same names for GERAN and UTRAN):<br> - X1 - Authentication and Ciphering timeout,<br> - X2 - RAN connection release sanity timeout,<br> - X3 - Handover procedure timeout.<br><br>The following commands are introduced:<br><br> - 'enable' node:<br> - show timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN]<br><br> - 'config-msc' node:<br> - timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)]<br><br>Both MNCC and SCCP related timer definitions are empty at the<br>moment. Achieved by using osmo_tdef_group API of libosmovty.<br><br>Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5<br>Related: OS#4368<br>---<br>M doc/manuals/vty/msc_vty_reference.xml<br>M include/osmocom/msc/msc_common.h<br>M src/libmsc/msc_net_init.c<br>M src/libmsc/msc_vty.c<br>M tests/test_nodes.vty<br>5 files changed, 67 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/vty/msc_vty_reference.xml b/doc/manuals/vty/msc_vty_reference.xml</span><br><span>index 7fba1a9..36cbf77 100644</span><br><span>--- a/doc/manuals/vty/msc_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/msc_vty_reference.xml</span><br><span>@@ -576,6 +576,19 @@</span><br><span> <param name='<0-65535>' doc='CI' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='show' doc='Show running system information' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='timer' doc='Show timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[mgw]' doc='MGW (Media Gateway) interface' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[mncc]' doc='MNCC (Mobile Network Call Control) interface' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[sccp]' doc='SCCP (Signalling Connection Control Part)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[geran]' doc='GERAN (GSM EDGE Radio Access Network)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[utran]' doc='UTRAN (UMTS Terrestrial Radio Access Network)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[sgs]' doc='SGs interface towards MME' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[TNNNN]' doc='T- or X-timer-number -- 3GPP compliant timer number of the format '1234' or 'T1234' or 't1234'; Osmocom-specific timer number of the format: 'X1234' or 'x1234'.' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span> <command id='show fsm NAME'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span>@@ -1392,6 +1405,19 @@</span><br><span> <param name='<0-65535>' doc='CI' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='show' doc='Show running system information' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='timer' doc='Show timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[mgw]' doc='MGW (Media Gateway) interface' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[mncc]' doc='MNCC (Mobile Network Call Control) interface' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[sccp]' doc='SCCP (Signalling Connection Control Part)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[geran]' doc='GERAN (GSM EDGE Radio Access Network)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[utran]' doc='UTRAN (UMTS Terrestrial Radio Access Network)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[sgs]' doc='SGs interface towards MME' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[TNNNN]' doc='T- or X-timer-number -- 3GPP compliant timer number of the format '1234' or 'T1234' or 't1234'; Osmocom-specific timer number of the format: 'X1234' or 'x1234'.' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span> <command id='show fsm NAME'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span>@@ -2910,6 +2936,20 @@</span><br><span> <param name='RAN_PC_OR_MSC_IPA_NAME' doc='Point code or MSC IPA name value' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='timer' doc='Configure or show timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[mgw]' doc='MGW (Media Gateway) interface' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[mncc]' doc='MNCC (Mobile Network Call Control) interface' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[sccp]' doc='SCCP (Signalling Connection Control Part)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[geran]' doc='GERAN (GSM EDGE Radio Access Network)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[utran]' doc='UTRAN (UMTS Terrestrial Radio Access Network)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[sgs]' doc='SGs interface towards MME' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[TNNNN]' doc='T- or X-timer-number -- 3GPP compliant timer number of the format '1234' or 'T1234' or 't1234'; Osmocom-specific timer number of the format: 'X1234' or 'x1234'.' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[<0-2147483647>]' doc='New timer value' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='[default]' doc='Set to default timer value' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span> <command id='mgw local-ip A.B.C.D'></span><br><span> <params></span><br><span> <param name='mgw' doc='Configure MGCP connection to Media Gateway' /></span><br><span>diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h</span><br><span>index 78337f7..bd85722 100644</span><br><span>--- a/include/osmocom/msc/msc_common.h</span><br><span>+++ b/include/osmocom/msc/msc_common.h</span><br><span>@@ -1,5 +1,7 @@</span><br><span> #pragma once</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/tdef.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span> </span><br><span>@@ -7,6 +9,8 @@</span><br><span> struct gsm_network;</span><br><span> struct vlr_subscr;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern struct osmo_tdef_group msc_tdef_group[];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define MSC_HLR_REMOTE_IP_DEFAULT "127.0.0.1"</span><br><span> #define MSC_HLR_REMOTE_PORT_DEFAULT OSMO_GSUP_PORT</span><br><span> </span><br><span>diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c</span><br><span>index 91b6165..ffb8a3b 100644</span><br><span>--- a/src/libmsc/msc_net_init.c</span><br><span>+++ b/src/libmsc/msc_net_init.c</span><br><span>@@ -31,10 +31,25 @@</span><br><span> #include <osmocom/msc/gsm_04_11_gsup.h></span><br><span> #include <osmocom/msc/gsm_09_11.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* TODO: would be great to have all timer declarations in one place */</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/ran_infra.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/sccp_ran.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/call_leg.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_tdef mncc_tdefs[] = {</span><br><span> {}</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_tdef_group msc_tdef_group[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { .name = "mgw", .tdefs = g_mgw_tdefs, .desc = "MGW (Media Gateway) interface" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .name = "mncc", .tdefs = mncc_tdefs, .desc = "MNCC (Mobile Network Call Control) interface" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .name = "sccp", .tdefs = g_sccp_tdefs, .desc = "SCCP (Signalling Connection Control Part)" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .name = "geran", .tdefs = msc_tdefs_geran, .desc = "GERAN (GSM EDGE Radio Access Network)" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .name = "utran", .tdefs = msc_tdefs_utran, .desc = "UTRAN (UMTS Terrestrial Radio Access Network)" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .name = "sgs", .tdefs = msc_tdefs_sgs, .desc = "SGs interface towards MME" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { /* terminator */ }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/core/stat_item.h></span><br><span> </span><br><span> struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv)</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index 90cfc9d..53d44dc 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -36,6 +36,7 @@</span><br><span> </span><br><span> #include <osmocom/sigtran/sccp_helpers.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/tdef_vty.h></span><br><span> #include <osmocom/vty/command.h></span><br><span> #include <osmocom/vty/logging.h></span><br><span> #include <osmocom/vty/misc.h></span><br><span>@@ -716,6 +717,9 @@</span><br><span> </span><br><span> neighbor_ident_vty_write(vty);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Timer introspection commands (generic osmo_tdef API) */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_groups_write(vty, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -2002,6 +2006,9 @@</span><br><span> </span><br><span> neighbor_ident_vty_init(msc_network);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Timer configuration commands (generic osmo_tdef API) */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_groups_init(MSC_NODE, msc_tdef_group);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf);</span><br><span> #ifdef BUILD_IU</span><br><span> ranap_iu_vty_init(MSC_NODE, (enum ranap_nsap_addr_enc*)&msc_network->iu.rab_assign_addr_enc);</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index a4e0e15..2c2ce1b 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -69,6 +69,7 @@</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> neighbor (a|iu) cgi <0-999> <0-999> <0-65535> <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME</span><br><span> no neighbor (a|iu) (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME</span><br><span style="color: hsl(120, 100%, 40%);">+ timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)]</span><br><span> mgw local-ip A.B.C.D</span><br><span> mgw local-port <0-65535></span><br><span> mgw remote-ip A.B.C.D</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/16932">change 16932</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/c/osmo-msc/+/16932"/><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-Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5 </div>
<div style="display:none"> Gerrit-Change-Number: 16932 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>