<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12522">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mm_rx_id_resp(): use osmo_mi_name()<br><br>Change-Id: I6bb053def223ed698351ad9f52c1e36293df5d59<br>---<br>M src/libmsc/gsm_04_08.c<br>M tests/msc_vlr/msc_vlr_test_gsm_authen.err<br>M tests/msc_vlr/msc_vlr_test_gsm_ciph.err<br>M tests/msc_vlr/msc_vlr_test_no_authen.err<br>M tests/msc_vlr/msc_vlr_test_rest.err<br>5 files changed, 18 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 980f668..4baf996 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -290,8 +290,8 @@</span><br><span> static int mm_rx_id_resp(struct ran_conn *conn, struct msgb *msg)</span><br><span> {</span><br><span> struct gsm48_hdr *gh = msgb_l3(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t mi_type = gh->data[1] & GSM_MI_TYPE_MASK;</span><br><span style="color: hsl(0, 100%, 40%);">- char mi_string[GSM48_MI_SIZE];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *mi = gh->data+1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t mi_len = gh->data[0];</span><br><span> </span><br><span> if (!conn->vsub) {</span><br><span> LOGP(DMM, LOGL_ERROR,</span><br><span>@@ -299,13 +299,11 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_mi_to_string(mi_string, sizeof(mi_string), &gh->data[1], gh->data[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMM, "IDENTITY RESPONSE: MI(%s)=%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_mi_type_name(mi_type), mi_string);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DMM, "IDENTITY RESPONSE: MI=%s\n", osmo_mi_name(mi, mi_len));</span><br><span> </span><br><span> osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, gh->data);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return vlr_subscr_rx_id_resp(conn->vsub, gh->data+1, gh->data[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return vlr_subscr_rx_id_resp(conn->vsub, mi, mi_len);</span><br><span> }</span><br><span> </span><br><span> /* Chapter 9.2.15: Receive Location Updating Request.</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 afa9d97..fddfe07 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>@@ -1258,7 +1258,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-423423423423420</span><br><span> DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span> DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK</span><br><span>@@ -1489,7 +1489,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-423423423423420</span><br><span> DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span> DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK</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 611d62a..65e182c 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>@@ -1196,7 +1196,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-423423423423420</span><br><span> DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span> DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK</span><br><span>@@ -1655,7 +1655,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-423423423423420</span><br><span> DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span> DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK</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 8df3db5..3e28468 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>@@ -937,7 +937,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-423423423423420</span><br><span> DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span> DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK</span><br><span>@@ -1120,7 +1120,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-423423423423420</span><br><span> DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span> DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK</span><br><span>@@ -1262,7 +1262,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1()</span><br><span>@@ -1431,7 +1431,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1()</span><br><span>@@ -1520,7 +1520,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-423423423423420</span><br><span> DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span> DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK</span><br><span>@@ -1632,7 +1632,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1()</span><br><span>@@ -1798,7 +1798,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI-SV)=5234234234234276</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-SV-5234234234234276</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=5234234234234276</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A-0: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-0:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1()</span><br><span>@@ -2006,7 +2006,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-SV-4234234234234275</span><br><span> DVLR set IMEISV on subscriber; IMSI=901700000004620 IMEISV=4234234234234275</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: Received Event VLR_ULA_E_ID_IMEISV</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMEISV}: vlr_loc_upd_node1()</span><br><span>@@ -2095,7 +2095,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF IMSI-901700000004620:MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMEI-423423423423420</span><br><span> DVLR set IMEI on subscriber; IMSI=901700000004620 IMEI=423423423423420</span><br><span> DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_ID_IMEI</span><br><span> DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:GERAN-A-0:LU){LU_COMPL_VLR_S_WAIT_IMEI_TMSI}: Received Event LU_COMPL_VLR_E_IMEI_CHECK_ACK</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 42ce1e0..6d98408 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>@@ -402,7 +402,7 @@</span><br><span> MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP</span><br><span> DREF TMSI-0x23422342: MSC conn use + dtap == 1 (0x2: dtap)</span><br><span> DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)</span><br><span style="color: hsl(0, 100%, 40%);">-DMM IDENTITY RESPONSE: MI(IMSI)=901700000004620</span><br><span style="color: hsl(120, 100%, 40%);">+DMM IDENTITY RESPONSE: MI=IMSI-901700000004620</span><br><span> DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620</span><br><span> DVLR vlr_lu_fsm(TMSI-0x23422342:GERAN-A-0:LU){VLR_ULA_S_WAIT_IMSI}: Received Event VLR_ULA_E_ID_IMSI</span><br><span> DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12522">change 12522</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/12522"/><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: I6bb053def223ed698351ad9f52c1e36293df5d59 </div>
<div style="display:none"> Gerrit-Change-Number: 12522 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@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>