<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9169">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vlr_access_req_fsm: use correct cause codes<br><br>The FSM that controls the VLR ACCESS uses cause code 9<br>(GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE) to signal that the<br>identity of the MS is currently not known in VLR (MSC-Reboot)<br>However, this cause code is from the GMM domain and is interpreted<br>as GSM48_REJECT_SRV_OPT_TMP_OUT_OF_ORDER by the MS, which cauese<br>the MS not to make a new LOCATION UPDATE on CM SERVICE REQUEST<br><br>- use GSM48_REJECT_IMSI_UNKNOWN_IN_VLR and<br> GSM48_REJECT_IMSI_UNKNOWN_IN_VLR instead of<br> GSM48_REJECT_IMSI_UNKNOWN_IN_VLR<br><br>Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370<br>Closes: OS#3266<br>---<br>M src/libvlr/vlr_access_req_fsm.c<br>M tests/msc_vlr/msc_vlr_test_rest.err<br>2 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libvlr/vlr_access_req_fsm.c b/src/libvlr/vlr_access_req_fsm.c</span><br><span>index dd95821..79eb75f 100644</span><br><span>--- a/src/libvlr/vlr_access_req_fsm.c</span><br><span>+++ b/src/libvlr/vlr_access_req_fsm.c</span><br><span>@@ -381,7 +381,7 @@</span><br><span> if (!par->by_tmsi) {</span><br><span> /* We couldn't find a subscriber even by IMSI,</span><br><span> * Set User Error: Unidentified Subscriber */</span><br><span style="color: hsl(0, 100%, 40%);">- proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);</span><br><span style="color: hsl(120, 100%, 40%);">+ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR);</span><br><span> return;</span><br><span> } else {</span><br><span> /* TMSI was included, are we permitted to use it? */</span><br><span>@@ -392,7 +392,7 @@</span><br><span> return;</span><br><span> } else {</span><br><span> /* Set User Error: Unidentified Subscriber */</span><br><span style="color: hsl(0, 100%, 40%);">- proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);</span><br><span style="color: hsl(120, 100%, 40%);">+ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR);</span><br><span> return;</span><br><span> }</span><br><span> }</span><br><span>@@ -411,7 +411,7 @@</span><br><span> vsub = vlr_subscr_find_by_imsi(vlr, par->imsi);</span><br><span> if (!vsub) {</span><br><span> /* Set User Error: Unidentified Subscriber */</span><br><span style="color: hsl(0, 100%, 40%);">- proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);</span><br><span style="color: hsl(120, 100%, 40%);">+ proc_arq_fsm_done(fi, GSM48_REJECT_IMSI_UNKNOWN_IN_VLR);</span><br><span> return;</span><br><span> }</span><br><span> assoc_par_with_subscr(fi, vsub);</span><br><span>@@ -687,7 +687,7 @@</span><br><span> case GSM_MI_TYPE_IMEI:</span><br><span> /* TODO: IMEI (emergency call) */</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- proc_arq_fsm_done(fi, GSM48_REJECT_MS_IDENTITY_NOT_DERVIVABLE);</span><br><span style="color: hsl(120, 100%, 40%);">+ proc_arq_fsm_done(fi, GSM48_REJECT_INVALID_MANDANTORY_INF);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err</span><br><span>index 5f2d30f..e71295a 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_rest.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_rest.err</span><br><span>@@ -63,10 +63,10 @@</span><br><span> DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: is child of Subscr_Conn(CM_SERVICE_REQ:901700000004620)</span><br><span> DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: rev=GSM net=GERAN (no Auth)</span><br><span> DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: Received Event PR_ARQ_E_START</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: proc_arq_fsm_done(MS_IDENTITY_NOT_DERVIVABLE)</span><br><span style="color: hsl(120, 100%, 40%);">+DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: proc_arq_fsm_done(IMSI_UNKNOWN_IN_VLR)</span><br><span> DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_INIT}: state_chg to PR_ARQ_S_DONE</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: MS_IDENTITY_NOT_DERVIVABLE</span><br><span style="color: hsl(0, 100%, 40%);">-- sending CM Service Reject for unknown, cause: MS_IDENTITY_NOT_DERVIVABLE</span><br><span style="color: hsl(120, 100%, 40%);">+DVLR Process_Access_Request_VLR(CM_SERVICE_REQ:901700000004620){PR_ARQ_S_DONE}: Process Access Request result: IMSI_UNKNOWN_IN_VLR</span><br><span style="color: hsl(120, 100%, 40%);">+- sending CM Service Reject for unknown, cause: IMSI_UNKNOWN_IN_VLR</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: Received Event SUBSCR_CONN_E_CN_CLOSE</span><br><span> DMM Subscr_Conn(CM_SERVICE_REQ:901700000004620){SUBSCR_CONN_S_NEW}: state_chg to SUBSCR_CONN_S_RELEASING</span><br><span> DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9169">change 9169</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/9169"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic058c93387f9be9af4940f8961839c02b93ee370 </div>
<div style="display:none"> Gerrit-Change-Number: 9169 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>