<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13893">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved
  Vadim Yanitskiy: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vlr: when setting IMEISV, also set IMEI<br><br>Copy IMEISV to IMEI when IMEISV changes. The additional SV digits will<br>get cut off then. This is needed for the subscriber on demand use case,<br>since we can get the IMEISV early (see [1]), but need to send the IMEI<br>to the Check IMEI procedure.<br><br>While adjusting the tests, I have noticed that there are code paths<br>where we ask the MS for the IMEISV first, and later ask the MS for the<br>IMEI, although we already have the IMEISV. This could be improved in a<br>future patch.<br><br>[1] Change-Id I256224194c3b8caf2b58a88d11dccd32c569201f<br><br>Related: OS#2542<br>Change-Id: I02e7b66848bf7dddb31b105e2ae981432817ae1e<br>---<br>M src/libvlr/vlr.c<br>M tests/msc_vlr/msc_vlr_test_gsm_ciph.err<br>M tests/msc_vlr/msc_vlr_test_no_authen.err<br>3 files changed, 9 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c</span><br><span>index 5082469..f76a7ee 100644</span><br><span>--- a/src/libvlr/vlr.c</span><br><span>+++ b/src/libvlr/vlr.c</span><br><span>@@ -451,6 +451,9 @@</span><br><span>    OSMO_STRLCPY_ARRAY(vsub->imeisv, imeisv);</span><br><span>         DEBUGP(DVLR, "set IMEISV on subscriber; IMSI=%s IMEISV=%s\n",</span><br><span>             vsub->imsi, vsub->imeisv);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     /* Copy IMEISV to IMEI (additional SV digits get cut off) */</span><br><span style="color: hsl(120, 100%, 40%);">+  vlr_subscr_set_imei(vsub, imeisv);</span><br><span> }</span><br><span> </span><br><span> /* Safely copy the given MSISDN string to vsub->msisdn */</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>index 1999d89..7328a8d 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err</span><br><span>@@ -1783,6 +1783,7 @@</span><br><span> DRLL msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: RR GSM48_MT_RR_CIPH_M_COMPL</span><br><span> DBSSAP msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Ciphering Mode Complete contains Mobile Identity: IMEI-SV-4234234234234275F</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275</span><br><span style="color: hsl(120, 100%, 40%);">+DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=42342342342342</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_HLR_UPD}: Received Event VLR_ULA_E_ID_IMEISV</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_HLR_UPD}: Event VLR_ULA_E_ID_IMEISV not permitted</span><br><span> DREF msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - ms_sends_ciphering_mode_complete: now used by 1 (lu)</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err</span><br><span>index 7d668cb..a048215 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_no_authen.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_no_authen.err</span><br><span>@@ -1702,6 +1702,7 @@</span><br><span> DRLL msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_ID_RESP</span><br><span> DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275</span><br><span style="color: hsl(120, 100%, 40%);">+DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=42342342342342</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1()</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_post_auth()</span><br><span>@@ -1920,6 +1921,7 @@</span><br><span> DRLL msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_ID_RESP</span><br><span> DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275</span><br><span style="color: hsl(120, 100%, 40%);">+DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=42342342342342</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1()</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_post_auth()</span><br><span>@@ -2186,6 +2188,7 @@</span><br><span> DRLL msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_ID_RESP</span><br><span> DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275</span><br><span style="color: hsl(120, 100%, 40%);">+DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=42342342342342</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1()</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_post_auth()</span><br><span>@@ -2382,6 +2385,7 @@</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_ID_RESP</span><br><span> DMM IDENTITY RESPONSE: MI=IMEI-SV-5234234234234276</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=5234234234234276</span><br><span style="color: hsl(120, 100%, 40%);">+DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=52342342342342</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1()</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_post_auth()</span><br><span>@@ -2646,6 +2650,7 @@</span><br><span> DRLL msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: Dispatching 04.08 message: MM GSM48_MT_MM_ID_RESP</span><br><span> DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275</span><br><span style="color: hsl(120, 100%, 40%);">+DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=42342342342342</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1()</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_post_auth()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13893">change 13893</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/13893"/><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: I02e7b66848bf7dddb31b105e2ae981432817ae1e </div>
<div style="display:none"> Gerrit-Change-Number: 13893 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Pau Espin Pedrol <pespin@sysmocom.de> </div>