<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13904">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vlr: fix IMEI length<br><br>Set the length of vlr_subscr->imei to<br> GSM23003_IMEI_NUM_DIGITS_NO_CHK (14)<br>instead of<br> GSM23003_IMEISV_NUM_DIGITS (16).<br><br>Note that there is also GSM23003_IMEI_NUM_DIGITS (15), which includes<br>an additional checksum digit. This digit is not intended for digital<br>transmission, so we don't need to store it. Also by not storing it, we<br>can simply copy the IMEI-part from the IMEISV to the IMEI without<br>worrying about the checksum (will be done in a follow up patch).<br><br>A good overview of the IMEI/IMEISV structure is here:<br>https://en.wikipedia.org/wiki/International_Mobile_Equipment_Identity#Structure_of_the_IMEI_and_IMEISV_(IMEI_software_version)<br><br>Related: OS#2542<br>Change-Id: Iaf2569c099874b55acbd748b776394726cc5ce54<br>---<br>M include/osmocom/msc/vlr.h<br>M tests/msc_vlr/msc_vlr_test_gsm_authen.c<br>M tests/msc_vlr/msc_vlr_test_gsm_authen.err<br>M tests/msc_vlr/msc_vlr_test_gsm_ciph.c<br>M tests/msc_vlr/msc_vlr_test_gsm_ciph.err<br>M tests/msc_vlr/msc_vlr_test_no_authen.c<br>M tests/msc_vlr/msc_vlr_test_no_authen.err<br>7 files changed, 47 insertions(+), 51 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h</span><br><span>index 4c11951..b1c0d5d 100644</span><br><span>--- a/include/osmocom/msc/vlr.h</span><br><span>+++ b/include/osmocom/msc/vlr.h</span><br><span>@@ -146,7 +146,7 @@</span><br><span> struct osmo_cell_global_id cgi; /* 2.4.16 */</span><br><span> </span><br><span> char imeisv[GSM23003_IMEISV_NUM_DIGITS+1]; /* 2.2.3 */</span><br><span style="color: hsl(0, 100%, 40%);">- char imei[GSM23003_IMEISV_NUM_DIGITS+1]; /* 2.1.9 */</span><br><span style="color: hsl(120, 100%, 40%);">+ char imei[GSM23003_IMEI_NUM_DIGITS_NO_CHK+1]; /* 2.1.9 */</span><br><span> bool imsi_detached_flag; /* 2.7.1 */</span><br><span> bool conf_by_radio_contact_ind; /* 2.7.4.1 */</span><br><span> bool sub_dataconf_by_hlr_ind; /* 2.7.4.2 */</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c</span><br><span>index d68ce05..805ae64 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c</span><br><span>@@ -568,7 +568,7 @@</span><br><span> thwart_rx_non_initial_requests();</span><br><span> </span><br><span> btw("MS replies with an Identity Response, VLR sends the IMEI to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("30010809710000004026f050090824433224433224f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_expect_tx("30010809710000004026f050080724433224433224" VLR_TO_HLR);</span><br><span> ms_sends_msg("0559084a32244332244302");</span><br><span> EXPECT_ACCEPTED(false);</span><br><span> thwart_rx_non_initial_requests();</span><br><span>@@ -586,7 +586,7 @@</span><br><span> btw("Subscriber has the IMEI");</span><br><span> vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);</span><br><span> OSMO_ASSERT(vsub);</span><br><span style="color: hsl(0, 100%, 40%);">- VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d");</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(strcmp(vsub->imei, "42342342342342"), == 0, "%d");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> </span><br><span> BTW("subscriber detaches");</span><br><span>@@ -677,7 +677,7 @@</span><br><span> thwart_rx_non_initial_requests();</span><br><span> </span><br><span> btw("MS replies with an Identity Response, VLR sends the IMEI to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("30010809710000004026f050090824433224433224f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_expect_tx("30010809710000004026f050080724433224433224" VLR_TO_HLR);</span><br><span> ms_sends_msg("0559084a32244332244302");</span><br><span> EXPECT_ACCEPTED(false);</span><br><span> thwart_rx_non_initial_requests();</span><br><span>@@ -770,7 +770,7 @@</span><br><span> thwart_rx_non_initial_requests();</span><br><span> </span><br><span> btw("MS replies with an Identity Response, VLR sends the IMEI to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("30010809710000004026f050090824433224433224f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_expect_tx("30010809710000004026f050080724433224433224" VLR_TO_HLR);</span><br><span> ms_sends_msg("0559084a32244332244302");</span><br><span> EXPECT_ACCEPTED(false);</span><br><span> thwart_rx_non_initial_requests();</span><br><span>@@ -864,7 +864,7 @@</span><br><span> thwart_rx_non_initial_requests();</span><br><span> </span><br><span> btw("MS replies with an Identity Response, VLR sends the IMEI to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("30010809710000004026f050090824433224433224f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_expect_tx("30010809710000004026f050080724433224433224" VLR_TO_HLR);</span><br><span> ms_sends_msg("0559084a32244332244302");</span><br><span> EXPECT_ACCEPTED(false);</span><br><span> thwart_rx_non_initial_requests();</span><br><span>@@ -898,7 +898,7 @@</span><br><span> btw("Subscriber has the IMEI and TMSI");</span><br><span> vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);</span><br><span> OSMO_ASSERT(vsub);</span><br><span style="color: hsl(0, 100%, 40%);">- VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d");</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(strcmp(vsub->imei, "42342342342342"), == 0, "%d");</span><br><span> VERBOSE_ASSERT(vsub->tmsi, == 0x03020100, "0x%08x");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err</span><br><span>index 2a7b696..66a97c2 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err</span><br><span>@@ -1565,9 +1565,9 @@</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071: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-423423423423420</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</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:MSISDN-46071:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f0500807244332244332240a0101</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> msc_a_is_accepted() == false</span><br><span> requests shall be thwarted</span><br><span>@@ -1646,7 +1646,7 @@</span><br><span> llist_count(&msub_list) == 0</span><br><span> - Subscriber has the IMEI</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + test_gsm_authen_imei: now used by 2 (attached,test_gsm_authen_imei)</span><br><span style="color: hsl(0, 100%, 40%);">- strcmp(vsub->imei, "423423423423420") == 0</span><br><span style="color: hsl(120, 100%, 40%);">+ strcmp(vsub->imei, "42342342342342") == 0</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - test_gsm_authen_imei: now used by 1 (attached)</span><br><span> </span><br><span> </span><br><span>@@ -1875,9 +1875,9 @@</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071: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-423423423423420</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</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:MSISDN-46071:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f0500807244332244332240a0101</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> msc_a_is_accepted() == false</span><br><span> requests shall be thwarted</span><br><span>@@ -2140,9 +2140,9 @@</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071: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-423423423423420</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</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:MSISDN-46071:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f0500807244332244332240a0101</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> msc_a_is_accepted() == false</span><br><span> requests shall be thwarted</span><br><span>@@ -2406,9 +2406,9 @@</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071: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-423423423423420</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</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:MSISDN-46071:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f0500807244332244332240a0101</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> msc_a_is_accepted() == false</span><br><span> requests shall be thwarted</span><br><span>@@ -2527,7 +2527,7 @@</span><br><span> llist_count(&msub_list) == 0</span><br><span> - Subscriber has the IMEI and TMSI</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 + test_gsm_authen_tmsi_imei: now used by 2 (attached,test_gsm_authen_tmsi_imei)</span><br><span style="color: hsl(0, 100%, 40%);">- strcmp(vsub->imei, "423423423423420") == 0</span><br><span style="color: hsl(120, 100%, 40%);">+ strcmp(vsub->imei, "42342342342342") == 0</span><br><span> vsub->tmsi == 0x03020100</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 - test_gsm_authen_tmsi_imei: now used by 1 (attached)</span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>index 953b4c9..ceb17a5 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c</span><br><span>@@ -550,7 +550,7 @@</span><br><span> thwart_rx_non_initial_requests();</span><br><span> </span><br><span> btw("MS replies with an Identity Response, VLR sends the IMEI to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("30010809710000004026f050090824433224433224f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_expect_tx("30010809710000004026f050080724433224433224" VLR_TO_HLR);</span><br><span> ms_sends_msg("0559084a32244332244302");</span><br><span> EXPECT_ACCEPTED(false);</span><br><span> thwart_rx_non_initial_requests();</span><br><span>@@ -568,7 +568,7 @@</span><br><span> btw("Subscriber has the IMEI");</span><br><span> vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);</span><br><span> OSMO_ASSERT(vsub);</span><br><span style="color: hsl(0, 100%, 40%);">- VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d");</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(strcmp(vsub->imei, "42342342342342"), == 0, "%d");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> </span><br><span> BTW("subscriber detaches");</span><br><span>@@ -761,7 +761,7 @@</span><br><span> thwart_rx_non_initial_requests();</span><br><span> </span><br><span> btw("MS replies with an Identity Response, VLR sends the IMEI to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("30010809710000004026f050090824433224433224f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_expect_tx("30010809710000004026f050080724433224433224" VLR_TO_HLR);</span><br><span> ms_sends_msg("0559084a32244332244302");</span><br><span> EXPECT_ACCEPTED(false);</span><br><span> thwart_rx_non_initial_requests();</span><br><span>@@ -795,7 +795,7 @@</span><br><span> btw("Subscriber has the IMEI and TMSI");</span><br><span> vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);</span><br><span> OSMO_ASSERT(vsub);</span><br><span style="color: hsl(0, 100%, 40%);">- VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d");</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(strcmp(vsub->imei, "42342342342342"), == 0, "%d");</span><br><span> VERBOSE_ASSERT(vsub->tmsi, == 0x03020100, "0x%08x");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> </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 4abd840..1999d89 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>@@ -1520,9 +1520,9 @@</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071: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-423423423423420</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</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:MSISDN-46071:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f0500807244332244332240a0101</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> msc_a_is_accepted() == false</span><br><span> requests shall be thwarted</span><br><span>@@ -1601,7 +1601,7 @@</span><br><span> llist_count(&msub_list) == 0</span><br><span> - Subscriber has the IMEI</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + test_ciph_imei: now used by 2 (attached,test_ciph_imei)</span><br><span style="color: hsl(0, 100%, 40%);">- strcmp(vsub->imei, "423423423423420") == 0</span><br><span style="color: hsl(120, 100%, 40%);">+ strcmp(vsub->imei, "42342342342342") == 0</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - test_ciph_imei: now used by 1 (attached)</span><br><span> </span><br><span> </span><br><span>@@ -2120,9 +2120,9 @@</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071: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-423423423423420</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</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:MSISDN-46071:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f0500807244332244332240a0101</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> msc_a_is_accepted() == false</span><br><span> requests shall be thwarted</span><br><span>@@ -2241,7 +2241,7 @@</span><br><span> llist_count(&msub_list) == 0</span><br><span> - Subscriber has the IMEI and TMSI</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 + test_ciph_tmsi_imei: now used by 2 (attached,test_ciph_tmsi_imei)</span><br><span style="color: hsl(0, 100%, 40%);">- strcmp(vsub->imei, "423423423423420") == 0</span><br><span style="color: hsl(120, 100%, 40%);">+ strcmp(vsub->imei, "42342342342342") == 0</span><br><span> vsub->tmsi == 0x03020100</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 - test_ciph_tmsi_imei: now used by 1 (attached)</span><br><span> </span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c</span><br><span>index d9ec091..72647a3 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_no_authen.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c</span><br><span>@@ -419,7 +419,7 @@</span><br><span> thwart_rx_non_initial_requests();</span><br><span> </span><br><span> btw("MS replies with an Identity Response, VLR sends the IMEI to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("30010809710000004026f050090824433224433224f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_expect_tx("30010809710000004026f050080724433224433224" VLR_TO_HLR);</span><br><span> /* 3GPP TS 23.003: 6.2.1 Composition of IMEI: the IMEI ends with a</span><br><span> * spare digit that shall be sent as zero by the MS. */</span><br><span> ms_sends_msg("0559084a32244332244302");</span><br><span>@@ -437,7 +437,7 @@</span><br><span> btw("Subscriber has the IMEI");</span><br><span> vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);</span><br><span> OSMO_ASSERT(vsub);</span><br><span style="color: hsl(0, 100%, 40%);">- VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d");</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(strcmp(vsub->imei, "42342342342342"), == 0, "%d");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> </span><br><span> BTW("subscriber detaches");</span><br><span>@@ -494,7 +494,7 @@</span><br><span> thwart_rx_non_initial_requests();</span><br><span> </span><br><span> btw("MS replies with an Identity Response, VLR sends the IMEI to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("30010809710000004026f050090824433224433224f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_expect_tx("30010809710000004026f050080724433224433224" VLR_TO_HLR);</span><br><span> ms_sends_msg("0559084a32244332244302");</span><br><span> </span><br><span> btw("HLR accepts the IMEI");</span><br><span>@@ -519,7 +519,7 @@</span><br><span> btw("Subscriber has the IMEI and TMSI");</span><br><span> vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);</span><br><span> OSMO_ASSERT(vsub);</span><br><span style="color: hsl(0, 100%, 40%);">- VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d");</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(strcmp(vsub->imei, "42342342342342"), == 0, "%d");</span><br><span> VERBOSE_ASSERT(vsub->tmsi, == 0x03020100, "0x%08x");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> </span><br><span>@@ -645,13 +645,12 @@</span><br><span> EXPECT_CONN_COUNT(1);</span><br><span> vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);</span><br><span> OSMO_ASSERT(vsub);</span><br><span style="color: hsl(0, 100%, 40%);">- VERBOSE_ASSERT(vsub->imei[0], == 0, "%d");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> EXPECT_ACCEPTED(false);</span><br><span> thwart_rx_non_initial_requests();</span><br><span> </span><br><span> btw("MS replies with an Identity Response, VLR sends the IMEI to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("30010809710000004026f050090824433224433224f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_expect_tx("30010809710000004026f050080724433224433224" VLR_TO_HLR);</span><br><span> ms_sends_msg("0559084a32244332244302");</span><br><span> </span><br><span> btw("HLR accepts the IMEI");</span><br><span>@@ -667,7 +666,7 @@</span><br><span> btw("Subscriber has the IMEI");</span><br><span> vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);</span><br><span> OSMO_ASSERT(vsub);</span><br><span style="color: hsl(0, 100%, 40%);">- VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d");</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(strcmp(vsub->imei, "42342342342342"), == 0, "%d");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> </span><br><span> BTW("subscriber detaches");</span><br><span>@@ -871,13 +870,12 @@</span><br><span> EXPECT_CONN_COUNT(1);</span><br><span> vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);</span><br><span> OSMO_ASSERT(vsub);</span><br><span style="color: hsl(0, 100%, 40%);">- VERBOSE_ASSERT(vsub->imei[0], == 0, "%d");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> EXPECT_ACCEPTED(false);</span><br><span> thwart_rx_non_initial_requests();</span><br><span> </span><br><span> btw("MS replies with an Identity Response, VLR sends the IMEI to HLR");</span><br><span style="color: hsl(0, 100%, 40%);">- gsup_expect_tx("30010809710000004026f050090824433224433224f0" VLR_TO_HLR);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_expect_tx("30010809710000004026f050080724433224433224" VLR_TO_HLR);</span><br><span> ms_sends_msg("0559084a32244332244302");</span><br><span> </span><br><span> btw("HLR accepts the IMEI");</span><br><span>@@ -903,7 +901,7 @@</span><br><span> vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);</span><br><span> OSMO_ASSERT(vsub);</span><br><span> VERBOSE_ASSERT(strcmp(vsub->imeisv, "4234234234234275"), == 0, "%d");</span><br><span style="color: hsl(0, 100%, 40%);">- VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d");</span><br><span style="color: hsl(120, 100%, 40%);">+ VERBOSE_ASSERT(strcmp(vsub->imei, "42342342342342"), == 0, "%d");</span><br><span> VERBOSE_ASSERT(vsub->tmsi, == 0x03020100, "0x%08x");</span><br><span> vlr_subscr_put(vsub, __func__);</span><br><span> </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 129c8c1..7d668cb 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>@@ -1249,9 +1249,9 @@</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071: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-423423423423420</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</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:MSISDN-46071:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f0500807244332244332240a0101</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> - HLR accepts the IMEI</span><br><span> <-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f05101000a0101</span><br><span>@@ -1312,7 +1312,7 @@</span><br><span> llist_count(&msub_list) == 0</span><br><span> - Subscriber has the IMEI</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + test_no_authen_imei: now used by 2 (attached,test_no_authen_imei)</span><br><span style="color: hsl(0, 100%, 40%);">- strcmp(vsub->imei, "423423423423420") == 0</span><br><span style="color: hsl(120, 100%, 40%);">+ strcmp(vsub->imei, "42342342342342") == 0</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - test_no_authen_imei: now used by 1 (attached)</span><br><span> </span><br><span> </span><br><span>@@ -1498,9 +1498,9 @@</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071: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-423423423423420</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</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:MSISDN-46071:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f0500807244332244332240a0101</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> - HLR accepts the IMEI</span><br><span> <-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f05101000a0101</span><br><span>@@ -1595,7 +1595,7 @@</span><br><span> llist_count(&msub_list) == 0</span><br><span> - Subscriber has the IMEI and TMSI</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 + test_no_authen_tmsi_imei: now used by 2 (attached,test_no_authen_tmsi_imei)</span><br><span style="color: hsl(0, 100%, 40%);">- strcmp(vsub->imei, "423423423423420") == 0</span><br><span style="color: hsl(120, 100%, 40%);">+ strcmp(vsub->imei, "42342342342342") == 0</span><br><span> vsub->tmsi == 0x03020100</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 - test_no_authen_tmsi_imei: now used by 1 (attached)</span><br><span> </span><br><span>@@ -1992,7 +1992,6 @@</span><br><span> - We will only do business when the IMEI is known</span><br><span> llist_count(&msub_list) == 1</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + test_no_authen_imeisv_imei: now used by 2 (active-conn,test_no_authen_imeisv_imei)</span><br><span style="color: hsl(0, 100%, 40%);">- vsub->imei[0] == 0</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - test_no_authen_imeisv_imei: now used by 1 (active-conn)</span><br><span> msc_a_is_accepted() == false</span><br><span> requests shall be thwarted</span><br><span>@@ -2018,9 +2017,9 @@</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071: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-423423423423420</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</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:MSISDN-46071:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f0500807244332244332240a0101</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> - HLR accepts the IMEI</span><br><span> <-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f05101000a0101</span><br><span>@@ -2081,7 +2080,7 @@</span><br><span> llist_count(&msub_list) == 0</span><br><span> - Subscriber has the IMEI</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + test_no_authen_imeisv_imei: now used by 2 (attached,test_no_authen_imeisv_imei)</span><br><span style="color: hsl(0, 100%, 40%);">- strcmp(vsub->imei, "423423423423420") == 0</span><br><span style="color: hsl(120, 100%, 40%);">+ strcmp(vsub->imei, "42342342342342") == 0</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - test_no_authen_imeisv_imei: now used by 1 (attached)</span><br><span> </span><br><span> </span><br><span>@@ -2719,7 +2718,6 @@</span><br><span> - We will only do business when the IMEI is known</span><br><span> llist_count(&msub_list) == 1</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + test_no_authen_imeisv_tmsi_imei: now used by 2 (active-conn,test_no_authen_imeisv_tmsi_imei)</span><br><span style="color: hsl(0, 100%, 40%);">- vsub->imei[0] == 0</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - test_no_authen_imeisv_tmsi_imei: now used by 1 (active-conn)</span><br><span> msc_a_is_accepted() == false</span><br><span> requests shall be thwarted</span><br><span>@@ -2745,9 +2743,9 @@</span><br><span> DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: RAN decode: DTAP</span><br><span> DRLL msc_a(IMSI-901700000004620:MSISDN-46071: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-423423423423420</span><br><span style="color: hsl(0, 100%, 40%);">-DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</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:MSISDN-46071:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span style="color: hsl(0, 100%, 40%);">-GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f050090824433224433224f00a0101</span><br><span style="color: hsl(120, 100%, 40%);">+GSUP --> HLR: OSMO_GSUP_MSGT_CHECK_IMEI_REQUEST: 30010809710000004026f0500807244332244332240a0101</span><br><span> DREF msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_AUTH_CIPH}: - rx_from_ms: now used by 1 (lu)</span><br><span> - HLR accepts the IMEI</span><br><span> <-- GSUP rx OSMO_GSUP_MSGT_CHECK_IMEI_RESULT: 32010809710000004026f05101000a0101</span><br><span>@@ -2843,7 +2841,7 @@</span><br><span> - Subscriber has the IMEISV, IMEI and TMSI</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 + test_no_authen_imeisv_tmsi_imei: now used by 2 (attached,test_no_authen_imeisv_tmsi_imei)</span><br><span> strcmp(vsub->imeisv, "4234234234234275") == 0</span><br><span style="color: hsl(0, 100%, 40%);">- strcmp(vsub->imei, "423423423423420") == 0</span><br><span style="color: hsl(120, 100%, 40%);">+ strcmp(vsub->imei, "42342342342342") == 0</span><br><span> vsub->tmsi == 0x03020100</span><br><span> DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100 - test_no_authen_imeisv_tmsi_imei: now used by 1 (attached)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13904">change 13904</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/13904"/><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: Iaf2569c099874b55acbd748b776394726cc5ce54 </div>
<div style="display:none"> Gerrit-Change-Number: 13904 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>