<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/16933">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libvlr: use generic osmo_tdef API for T3250, T3260, and T3270<br><br>These timers so far were implemented as a list of unsigned integers,<br>which has never been initialized to any reasonable defaults. Since<br>they are used as state timeouts in several FSMs, we might end up<br>staying in some state forever.<br><br>Let's migrate to generic osmo_tdef API and use default values from<br>table 11.2 of 3GPP TS 24.008. This way the user can introspect and<br>change their values from the VTY / configuration file.<br><br>Change-Id: Ia8cf98da0aea0e626c5ff088a833d7359c43847f<br>Related: OS#4368<br>---<br>M doc/manuals/vty/msc_vty_reference.xml<br>M include/osmocom/msc/vlr.h<br>M src/libmsc/msc_vty.c<br>M src/libvlr/vlr.c<br>M tests/test_nodes.vty<br>5 files changed, 38 insertions(+), 32 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/33/16933/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 e3294cf..aed52ee 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,10 +610,11 @@</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(0, 100%, 40%);">- <command id='show timer (mgw|mncc|sccp) [TNNNN]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show timer (vlr|mgw|mncc|sccp) [TNNNN]'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span> <param name='timer' doc='Show timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='vlr' doc='VLR specific timers' /></span><br><span> <param name='mgw' doc='MGW specific timers' /></span><br><span> <param name='mncc' doc='MNCC specific timers' /></span><br><span> <param name='sccp' doc='SCCP specific timers' /></span><br><span>@@ -1462,10 +1463,11 @@</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(0, 100%, 40%);">- <command id='show timer (mgw|mncc|sccp) [TNNNN]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show timer (vlr|mgw|mncc|sccp) [TNNNN]'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span> <param name='timer' doc='Show timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='vlr' doc='VLR specific timers' /></span><br><span> <param name='mgw' doc='MGW specific timers' /></span><br><span> <param name='mncc' doc='MNCC specific timers' /></span><br><span> <param name='sccp' doc='SCCP specific timers' /></span><br><span>@@ -2931,9 +2933,10 @@</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(0, 100%, 40%);">- <command id='timer (mgw|mncc|sccp) [TNNNN] [(<0-2147483647>|default)]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='timer (vlr|mgw|mncc|sccp) [TNNNN] [(<0-2147483647>|default)]'></span><br><span> <params></span><br><span> <param name='timer' doc='Configure or show timers' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='vlr' doc='VLR specific timers' /></span><br><span> <param name='mgw' doc='MGW specific timers' /></span><br><span> <param name='mncc' doc='MNCC specific timers' /></span><br><span> <param name='sccp' doc='SCCP specific timers' /></span><br><span>diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h</span><br><span>index d22e3ec..1508598 100644</span><br><span>--- a/include/osmocom/msc/vlr.h</span><br><span>+++ b/include/osmocom/msc/vlr.h</span><br><span>@@ -252,13 +252,6 @@</span><br><span> int (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub);</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum vlr_timer {</span><br><span style="color: hsl(0, 100%, 40%);">- VLR_T_3250,</span><br><span style="color: hsl(0, 100%, 40%);">- VLR_T_3260,</span><br><span style="color: hsl(0, 100%, 40%);">- VLR_T_3270,</span><br><span style="color: hsl(0, 100%, 40%);">- _NUM_VLR_TIMERS</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* An instance of the VLR codebase */</span><br><span> struct vlr_instance {</span><br><span> struct llist_head subscribers;</span><br><span>@@ -275,7 +268,8 @@</span><br><span> bool auth_reuse_old_sets_on_error;</span><br><span> bool parq_retrieve_imsi;</span><br><span> bool is_ps;</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t timer[_NUM_VLR_TIMERS];</span><br><span style="color: hsl(120, 100%, 40%);">+ /* see vlr_instance_tdefs */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_tdef *tdefs;</span><br><span> } cfg;</span><br><span> /* A free-form pointer for use by the caller */</span><br><span> void *user_ctx;</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index b43e950..f6dfaaa 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -656,8 +656,9 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_msc_timer, cfg_msc_timer_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "timer (mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_SET_OPTIONAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ "timer (vlr|mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_SET_OPTIONAL,</span><br><span> "Configure or show timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "VLR specific timers\n"</span><br><span> "MGW specific timers\n"</span><br><span> "MNCC specific timers\n"</span><br><span> "SCCP specific timers\n"</span><br><span>@@ -666,7 +667,9 @@</span><br><span> const char *T_arg = argc > 1 ? argv[1] : NULL;</span><br><span> struct osmo_tdef *tdefs = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!strcmp(argv[0], "mgw"))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "vlr"))</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = gsmnet->vlr->cfg.tdefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!strcmp(argv[0], "mgw"))</span><br><span> tdefs = gsmnet->mgw.tdefs;</span><br><span> else if (!strcmp(argv[0], "mncc"))</span><br><span> tdefs = gsmnet->mncc_tdefs;</span><br><span>@@ -773,6 +776,7 @@</span><br><span> neighbor_ident_vty_write(vty);</span><br><span> </span><br><span> /* Timer management commands */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdef_vty_write(vty, gsmnet->vlr->cfg.tdefs, " timer vlr ");</span><br><span> osmo_tdef_vty_write(vty, gsmnet->mgw.tdefs, " timer mgw ");</span><br><span> osmo_tdef_vty_write(vty, gsmnet->mncc_tdefs, " timer mncc ");</span><br><span> osmo_tdef_vty_write(vty, g_sccp_tdefs, " timer sccp ");</span><br><span>@@ -786,8 +790,9 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(show_timer, show_timer_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "show timer (mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_T_OPTIONAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show timer (vlr|mgw|mncc|sccp) " OSMO_TDEF_VTY_ARG_T_OPTIONAL,</span><br><span> SHOW_STR "Show timers\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "VLR specific timers\n"</span><br><span> "MGW specific timers\n"</span><br><span> "MNCC specific timers\n"</span><br><span> "SCCP specific timers\n"</span><br><span>@@ -796,7 +801,9 @@</span><br><span> const char *T_arg = argc > 1 ? argv[1] : NULL;</span><br><span> struct osmo_tdef *tdefs = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!strcmp(argv[0], "mgw"))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "vlr"))</span><br><span style="color: hsl(120, 100%, 40%);">+ tdefs = gsmnet->vlr->cfg.tdefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!strcmp(argv[0], "mgw"))</span><br><span> tdefs = gsmnet->mgw.tdefs;</span><br><span> else if (!strcmp(argv[0], "mncc"))</span><br><span> tdefs = gsmnet->mncc_tdefs;</span><br><span>@@ -849,6 +856,7 @@</span><br><span> SHOW_STR "Show timers\n"</span><br><span> "Show all existing timers\n")</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ TDEF_LIST_PRINT(gsmnet->vlr->cfg.tdefs, "VLR specific timers", 2);</span><br><span> TDEF_LIST_PRINT(gsmnet->mgw.tdefs, "MGW specific timers", 2);</span><br><span> TDEF_LIST_PRINT(gsmnet->mncc_tdefs, "MNCC specific timers", 2);</span><br><span> TDEF_LIST_PRINT(g_sccp_tdefs, "SCCP specific timers", 2);</span><br><span>diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c</span><br><span>index b164fd8..0e7cfe8 100644</span><br><span>--- a/src/libvlr/vlr.c</span><br><span>+++ b/src/libvlr/vlr.c</span><br><span>@@ -23,6 +23,7 @@</span><br><span> #include <osmocom/core/fsm.h></span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/timer.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/tdef.h></span><br><span> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h></span><br><span> #include <osmocom/gsm/gsup.h></span><br><span> #include <osmocom/gsm/apn.h></span><br><span>@@ -61,24 +62,20 @@</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* 3GPP TS 24.008, table 11.2 Mobility management timers (network-side) */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_tdef vlr_instance_tdefs[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: also define T3212 here */</span><br><span style="color: hsl(120, 100%, 40%);">+ { .T = 3250, .default_val = 12, .desc = "TMSI Reallocation procedure" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .T = 3260, .default_val = 12, .desc = "Authentication procedure" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { .T = 3270, .default_val = 12, .desc = "Identification procedure" },</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 style="color: hsl(120, 100%, 40%);">+/* This is just a wrapper around the osmo_tdef API.</span><br><span style="color: hsl(120, 100%, 40%);">+ * TODO: we should start using osmo_tdef_fsm_inst_state_chg() */</span><br><span> uint32_t vlr_timer(struct vlr_instance *vlr, uint32_t timer)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t tidx = 0xffffffff;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (timer) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 3270:</span><br><span style="color: hsl(0, 100%, 40%);">- tidx = VLR_T_3270;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 3260:</span><br><span style="color: hsl(0, 100%, 40%);">- tidx = VLR_T_3260;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 3250:</span><br><span style="color: hsl(0, 100%, 40%);">- tidx = VLR_T_3250;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(tidx < sizeof(vlr->cfg.timer));</span><br><span style="color: hsl(0, 100%, 40%);">- return vlr->cfg.timer[tidx];</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_tdef_get(vlr->cfg.tdefs, timer, OSMO_TDEF_S, 0);</span><br><span> }</span><br><span> </span><br><span> /* return static buffer with printable name of VLR subscriber */</span><br><span>@@ -1266,6 +1263,10 @@</span><br><span> /* defaults */</span><br><span> vlr->cfg.assign_tmsi = true;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Timers configuration */</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr->cfg.tdefs = vlr_instance_tdefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_tdefs_reset(vlr->cfg.tdefs);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* osmo_auth_fsm.c */</span><br><span> OSMO_ASSERT(osmo_fsm_register(&vlr_auth_fsm) == 0);</span><br><span> /* osmo_lu_fsm.c */</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index da565f4..39755c3 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -65,7 +65,7 @@</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(0, 100%, 40%);">- timer (mgw|mncc|sccp) [TNNNN] [(<0-2147483647>|default)]</span><br><span style="color: hsl(120, 100%, 40%);">+ timer (vlr|mgw|mncc|sccp) [TNNNN] [(<0-2147483647>|default)]</span><br><span> 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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/16933">change 16933</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/+/16933"/><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: Ia8cf98da0aea0e626c5ff088a833d7359c43847f </div>
<div style="display:none"> Gerrit-Change-Number: 16933 </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>