<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/16932">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">VTY: add osmo_tdef introspection and configuration commands<br><br>This change introduces a group of 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 (common 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) [TNNNN]<br> - show timer ran (geran|utran|sgs) [TNNNN]<br> - show timer [all]<br><br> - 'config-msc' node:<br> - timer (mgw|mncc|sccp) [TNNNN] [(<0-2147483647>|default)]<br> - timer ran (geran|utran|sgs) [TNNNN] [(<0-2147483647>|default)]<br><br>Both MNCC and SCCP related timer definitions are empty at the moment.<br><br>Change-Id: I6024c104b6101666c8aa1108a043910eb75db9a5<br>Related: OS#4368<br>---<br>M doc/manuals/vty/msc_vty_reference.xml<br>M src/libmsc/msc_vty.c<br>M tests/test_nodes.vty<br>3 files changed, 230 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/16932/1</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 b98f76e..e3294cf 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>@@ -610,6 +610,34 @@</span><br><span> <param name='sgs-connections' doc='Show SGs interface connections / MMEs' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show timer (mgw|mncc|sccp) [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 specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='mncc' doc='MNCC specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='sccp' doc='SCCP specific timers' /></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 style="color: hsl(120, 100%, 40%);">+ <command id='show timer ran (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='ran' doc='Show timers for a given RAN type' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='geran' doc='GERAN specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='utran' doc='UTRAN specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='sgs' doc='SGs specific timers' /></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 style="color: hsl(120, 100%, 40%);">+ <command id='show timer [all]'></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='[all]' doc='Show all existing timers' /></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 subscriber (msisdn|extension|imsi|tmsi|id) ID [(conn|trans|conn+trans)]'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span>@@ -1434,6 +1462,34 @@</span><br><span> <param name='sgs-connections' doc='Show SGs interface connections / MMEs' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show timer (mgw|mncc|sccp) [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 specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='mncc' doc='MNCC specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='sccp' doc='SCCP specific timers' /></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 style="color: hsl(120, 100%, 40%);">+ <command id='show timer ran (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='ran' doc='Show timers for a given RAN type' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='geran' doc='GERAN specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='utran' doc='UTRAN specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='sgs' doc='SGs specific timers' /></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 style="color: hsl(120, 100%, 40%);">+ <command id='show timer [all]'></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='[all]' doc='Show all existing timers' /></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 subscriber (msisdn|extension|imsi|tmsi|id) ID [(conn|trans|conn+trans)]'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span>@@ -2875,6 +2931,29 @@</span><br><span> <param name='MSISDN_LAST' doc='Last Handover Number MSISDN' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='timer (mgw|mncc|sccp) [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 specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='mncc' doc='MNCC specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='sccp' doc='SCCP specific timers' /></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 style="color: hsl(120, 100%, 40%);">+ <command id='timer ran (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='ran' doc='Show timers for a given RAN type' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='geran' doc='GERAN specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='utran' doc='UTRAN specific timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='sgs' doc='SGs specific timers' /></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='neighbor (a|iu) lac <0-65535> (ran-pc|msc-ipa-name) RAN_PC_OR_MSC_IPA_NAME'></span><br><span> <params></span><br><span> <param name='neighbor' doc='Add Handover target configuration' /></span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index cd82a07..b43e950 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -40,6 +40,7 @@</span><br><span> #include <osmocom/vty/logging.h></span><br><span> #include <osmocom/vty/misc.h></span><br><span> #include <osmocom/vty/stats.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/vty/tdef_vty.h></span><br><span> </span><br><span> #ifdef BUILD_IU</span><br><span> #include <osmocom/ranap/iu_client.h></span><br><span>@@ -654,6 +655,61 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_msc_timer, cfg_msc_timer_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "timer (mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_SET_OPTIONAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure or show timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "MGW specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "MNCC specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "SCCP specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_TDEF_VTY_DOC_SET)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *T_arg = argc > 1 ? argv[1] : NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_tdef *tdefs = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "mgw"))</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = gsmnet->mgw.tdefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!strcmp(argv[0], "mncc"))</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = gsmnet->mncc_tdefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!strcmp(argv[0], "sccp"))</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = g_sccp_tdefs;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Configure or show? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argc < 3)</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_tdef_vty_show_cmd(vty, tdefs, T_arg, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_tdef_vty_set_cmd(vty, tdefs, argv + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_msc_timer_ran, cfg_msc_timer_ran_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "timer ran (geran|utran|sgs) " OSMO_TDEF_VTY_ARG_SET_OPTIONAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure or show timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Show timers for a given RAN type\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "GERAN specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "UTRAN specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "SGs specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_TDEF_VTY_DOC_SET)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *T_arg = argc > 1 ? argv[1] : NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_tdef *tdefs = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Match RAN type by the first character */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (argv[0][0]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'g':</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = msc_tdefs_geran;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'u':</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = msc_tdefs_utran;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 's':</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = msc_tdefs_sgs;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Configure or show? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argc < 3)</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_tdef_vty_show_cmd(vty, tdefs, T_arg, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_tdef_vty_set_cmd(vty, tdefs, argv + 1);</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>@@ -716,6 +772,92 @@</span><br><span> </span><br><span> neighbor_ident_vty_write(vty);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Timer management commands */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_write(vty, gsmnet->mgw.tdefs, " timer mgw ");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_write(vty, gsmnet->mncc_tdefs, " timer mncc ");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_write(vty, g_sccp_tdefs, " timer sccp ");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: can we use osmo_tdef_group for that? */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_write(vty, msc_tdefs_geran, " timer ran geran ");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_write(vty, msc_tdefs_utran, " timer ran utran ");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_write(vty, msc_tdefs_sgs, " timer ran sgs ");</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 style="color: hsl(120, 100%, 40%);">+DEFUN(show_timer, show_timer_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show timer (mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_T_OPTIONAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "Show timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "MGW specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "MNCC specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "SCCP specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_TDEF_VTY_DOC_T)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *T_arg = argc > 1 ? argv[1] : NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_tdef *tdefs = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "mgw"))</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = gsmnet->mgw.tdefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!strcmp(argv[0], "mncc"))</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = gsmnet->mncc_tdefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!strcmp(argv[0], "sccp"))</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = g_sccp_tdefs;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_tdef_vty_show_cmd(vty, tdefs, T_arg, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(show_timer_ran, show_timer_ran_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show timer ran (geran|utran|sgs) " OSMO_TDEF_VTY_ARG_T_OPTIONAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "Show timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Show timers for a given RAN type\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "GERAN specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "UTRAN specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "SGs specific timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_TDEF_VTY_DOC_T)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *T_arg = argc > 1 ? argv[1] : NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_tdef *tdefs = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Match RAN type by the first character */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (argv[0][0]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'g':</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = msc_tdefs_geran;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'u':</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = msc_tdefs_utran;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 's':</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = msc_tdefs_sgs;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_tdef_vty_show_cmd(vty, tdefs, T_arg, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* TODO: move to libosmocore? */</span><br><span style="color: hsl(120, 100%, 40%);">+#define TDEF_LIST_EMPTY(list) \</span><br><span style="color: hsl(120, 100%, 40%);">+ !(list->T || list->default_val || list->desc)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define TDEF_LIST_PRINT(list, desc, offset) \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(TDEF_LIST_EMPTY(list))) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s:%s", desc, VTY_NEWLINE); \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_out_all(vty, list, "%*c", offset, ' '); \</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(show_timer_all, show_timer_all_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show timer [all]",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "Show timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Show all existing timers\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ TDEF_LIST_PRINT(gsmnet->mgw.tdefs, "MGW specific timers", 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ TDEF_LIST_PRINT(gsmnet->mncc_tdefs, "MNCC specific timers", 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ TDEF_LIST_PRINT(g_sccp_tdefs, "SCCP specific timers", 2);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%sRAN specific timers:%s", VTY_NEWLINE, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ TDEF_LIST_PRINT(msc_tdefs_geran, " GERAN", 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ TDEF_LIST_PRINT(msc_tdefs_utran, " UTRAN", 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ TDEF_LIST_PRINT(msc_tdefs_sgs, " SGs", 4);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -2001,6 +2143,9 @@</span><br><span> 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 style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_timer_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_timer_ran_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> neighbor_ident_vty_init(msc_network);</span><br><span> </span><br><span> mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf);</span><br><span>@@ -2013,6 +2158,10 @@</span><br><span> </span><br><span> osmo_signal_register_handler(SS_SCALL, scall_cbfn, NULL);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_timer_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_timer_ran_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_timer_all_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> install_element_ve(&show_subscr_cmd);</span><br><span> install_element_ve(&show_subscr_cache_cmd);</span><br><span> install_element_ve(&show_bsc_cmd);</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index a4e0e15..da565f4 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -65,6 +65,8 @@</span><br><span> no sms-over-gsup</span><br><span> osmux (on|off|only)</span><br><span> handover-number range MSISDN_FIRST MSISDN_LAST</span><br><span style="color: hsl(120, 100%, 40%);">+ timer (mgw|mncc|sccp) [TNNNN] [(<0-2147483647>|default)]</span><br><span style="color: hsl(120, 100%, 40%);">+ timer ran (geran|utran|sgs) [TNNNN] [(<0-2147483647>|default)]</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> 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></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: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>