<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/16933">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;">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/msc_common.h<br>M include/osmocom/msc/vlr.h<br>M src/libmsc/msc_net_init.c<br>M src/libvlr/vlr.c<br>M tests/test_nodes.vty<br>6 files changed, 22 insertions(+), 28 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 36cbf77..6418425 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,10 +576,11 @@</span><br><span> <param name='<0-65535>' doc='CI' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='show timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show timer [(vlr|mgw|mncc|sccp|geran|utran|sgs)] [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 (Visitors Location Register)' /></span><br><span> <param name='[mgw]' doc='MGW (Media Gateway) interface' /></span><br><span> <param name='[mncc]' doc='MNCC (Mobile Network Call Control) interface' /></span><br><span> <param name='[sccp]' doc='SCCP (Signalling Connection Control Part)' /></span><br><span>@@ -1405,10 +1406,11 @@</span><br><span> <param name='<0-65535>' doc='CI' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='show timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show timer [(vlr|mgw|mncc|sccp|geran|utran|sgs)] [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 (Visitors Location Register)' /></span><br><span> <param name='[mgw]' doc='MGW (Media Gateway) interface' /></span><br><span> <param name='[mncc]' doc='MNCC (Mobile Network Call Control) interface' /></span><br><span> <param name='[sccp]' doc='SCCP (Signalling Connection Control Part)' /></span><br><span>@@ -2936,9 +2938,10 @@</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(0, 100%, 40%);">- <command id='timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='timer [(vlr|mgw|mncc|sccp|geran|utran|sgs)] [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 (Visitors Location Register)' /></span><br><span> <param name='[mgw]' doc='MGW (Media Gateway) interface' /></span><br><span> <param name='[mncc]' doc='MNCC (Mobile Network Call Control) interface' /></span><br><span> <param name='[sccp]' doc='SCCP (Signalling Connection Control Part)' /></span><br><span>diff --git a/include/osmocom/msc/msc_common.h b/include/osmocom/msc/msc_common.h</span><br><span>index bd85722..8a43e69 100644</span><br><span>--- a/include/osmocom/msc/msc_common.h</span><br><span>+++ b/include/osmocom/msc/msc_common.h</span><br><span>@@ -10,6 +10,7 @@</span><br><span> struct vlr_subscr;</span><br><span> </span><br><span> extern struct osmo_tdef_group msc_tdef_group[];</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct osmo_tdef msc_tdefs_vlr[];</span><br><span> </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>diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h</span><br><span>index d22e3ec..615c6c8 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,6 @@</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> } 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_net_init.c b/src/libmsc/msc_net_init.c</span><br><span>index ffb8a3b..8c8fb86 100644</span><br><span>--- a/src/libmsc/msc_net_init.c</span><br><span>+++ b/src/libmsc/msc_net_init.c</span><br><span>@@ -41,6 +41,7 @@</span><br><span> };</span><br><span> </span><br><span> struct osmo_tdef_group msc_tdef_group[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { .name = "vlr", .tdefs = msc_tdefs_vlr, .desc = "VLR (Visitors Location Register)" },</span><br><span> { .name = "mgw", .tdefs = g_mgw_tdefs, .desc = "MGW (Media Gateway) interface" },</span><br><span> { .name = "mncc", .tdefs = mncc_tdefs, .desc = "MNCC (Mobile Network Call Control) interface" },</span><br><span> { .name = "sccp", .tdefs = g_sccp_tdefs, .desc = "SCCP (Signalling Connection Control Part)" },</span><br><span>diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c</span><br><span>index b164fd8..a1489f2 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%);">+struct osmo_tdef msc_tdefs_vlr[] = {</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(msc_tdefs_vlr, 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>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index 2c2ce1b..b87a371 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -69,7 +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(0, 100%, 40%);">- timer [(mgw|mncc|sccp|geran|utran|sgs)] [TNNNN] [(<0-2147483647>|default)]</span><br><span style="color: hsl(120, 100%, 40%);">+ timer [(vlr|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/+/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: 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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>