<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17646">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/RSL_Types: use MobileIdentityLV for MS Identity IE<br><br>Change-Id: I5436dcbbc961d5b572e10e4f1a3f806d252d7818<br>---<br>M bsc/BSC_Tests.ttcn<br>M bts/BTS_Tests.ttcn<br>M library/RSL_Types.ttcn<br>3 files changed, 33 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/17646/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index de7102e..353ab16 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -1298,11 +1298,10 @@</span><br><span> template BSSMAP_FIELD_CellIdentificationList cid_list,</span><br><span> BtsIdList bts_ids := { 0 },</span><br><span> template RSL_ChanNeeded rsl_chneed := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- template OCT4 tmsi := omit) runs on test_CT</span><br><span style="color: hsl(120, 100%, 40%);">+ template (omit) OCT4 tmsi := omit) runs on test_CT</span><br><span> {</span><br><span> var template BSSMAP_IE_ChannelNeeded bssmap_chneed;</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME (unused): var MobileIdentity mi; */</span><br><span style="color: hsl(0, 100%, 40%);">- var template octetstring id_enc; /* FIXME */</span><br><span style="color: hsl(120, 100%, 40%);">+ var template MobileIdentityV mi;</span><br><span> var RSL_Message rx_rsl;</span><br><span> var integer paging_group := hex2int(imsi[lengthof(imsi)-1]);</span><br><span> var integer i;</span><br><span>@@ -1323,17 +1322,14 @@</span><br><span> </span><br><span> f_bssap_tx_ud(ts_BSSMAP_Paging(imsi, cid_list, tmsi, bssmap_chneed));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* FIXME: Disabled due to bugs in both GSM_RR_Types and MobileL3_CommonIE_Types IMSI encoder</span><br><span style="color: hsl(0, 100%, 40%);">- if (isvalue(tmsi)) {</span><br><span style="color: hsl(0, 100%, 40%);">- mi := valueof(t_Osmo_MI_TMSI(oct2int(valueof(tmsi))));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not istemplatekind(tmsi, "omit")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ mi := t_MI_TMSI(tmsi);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- mi := valueof(ts_Osmo_MI_IMSI(imsi));</span><br><span style="color: hsl(120, 100%, 40%);">+ mi := tr_MI_IMSI(imsi);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- id_enc := enc_MobileIdentity(mi);</span><br><span style="color: hsl(0, 100%, 40%);">-*/</span><br><span style="color: hsl(0, 100%, 40%);">- id_enc := ?;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> for (i := 0; i < sizeof(bts_ids); i := i + 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- rx_rsl := f_exp_ipa_rx(bts_ids[i], tr_RSL_PAGING_CMD(id_enc));</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_rsl := f_exp_ipa_rx(bts_ids[i], tr_RSL_PAGING_CMD(mi));</span><br><span> /* check channel type, paging group */</span><br><span> if (rx_rsl.ies[1].body.paging_group != paging_group) {</span><br><span> setverdict(fail, "Paging for wrong paging group");</span><br><span>@@ -1352,7 +1348,7 @@</span><br><span> }</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] IPA_RSL[i].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_PAGING_CMD(id_enc))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] IPA_RSL[i].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_PAGING_CMD(mi))) {</span><br><span> setverdict(fail, "Paging on BTS ", i, " which is not part of ", bts_ids);</span><br><span> }</span><br><span> [] IPA_RSL[i].receive { repeat; }</span><br><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 3018bca..9534a8b 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -2978,18 +2978,17 @@</span><br><span> /* Send paging cmds based on elapsed time */</span><br><span> var integer new_sent := f_min(pkt_total, float2int(T_total.read * pch_blocks_per_sec) + 1);</span><br><span> while (st.num_paging_sent < new_sent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* build mobile Identity */</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileIdentityLV mi;</span><br><span> if (cfg.use_tmsi) {</span><br><span style="color: hsl(0, 100%, 40%);">- mi := valueof(ts_MI_TMSI_LV(f_rnd_octstring(4)));</span><br><span style="color: hsl(120, 100%, 40%);">+ mi := valueof(t_MI_TMSI(f_rnd_octstring(4)));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- mi := valueof(ts_MI_IMSI_LV(f_gen_imsi(st.num_paging_sent)));</span><br><span style="color: hsl(120, 100%, 40%);">+ mi := valueof(ts_MI_IMSI(f_gen_imsi(st.num_paging_sent)));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring mi_enc_lv := enc_MobileIdentityLV(mi);</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring mi_enc := substr(mi_enc_lv, 1, lengthof(mi_enc_lv)-1);</span><br><span> </span><br><span> /* Send RSL PAGING COMMAND */</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi_enc, st.num_paging_sent mod 4)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi, st.num_paging_sent mod 4)));</span><br><span> </span><br><span> st.num_paging_sent := st.num_paging_sent + 1;</span><br><span> }</span><br><span>@@ -4570,22 +4569,27 @@</span><br><span> f_init_pcu_test();</span><br><span> </span><br><span> for (var integer i := 0; i < 100; i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV mi_lv;</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring mi_lv_enc;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityV mi;</span><br><span> timer T := 3.0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (i < 50) {</span><br><span style="color: hsl(0, 100%, 40%);">- mi := valueof(ts_MI_TMSI_LV(f_rnd_octstring(4)));</span><br><span style="color: hsl(120, 100%, 40%);">+ mi := valueof(t_MI_TMSI(f_rnd_octstring(4)));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- mi := valueof(ts_MI_IMSI_LV(f_gen_imsi(i)));</span><br><span style="color: hsl(120, 100%, 40%);">+ mi := valueof(ts_MI_IMSI(f_gen_imsi(i)));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring mi_enc_lv := enc_MobileIdentityLV(mi);</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring mi_enc := substr(mi_enc_lv, 1, lengthof(mi_enc_lv)-1);</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring t_mi_lv := f_pad_oct(mi_enc_lv, 9, '00'O);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Fancy encoding for PCUIF */</span><br><span style="color: hsl(120, 100%, 40%);">+ mi_lv := valueof(ts_MI_LV(mi));</span><br><span style="color: hsl(120, 100%, 40%);">+ mi_lv_enc := enc_MobileIdentityLV(mi_lv);</span><br><span style="color: hsl(120, 100%, 40%);">+ mi_lv_enc := f_pad_oct(mi_lv_enc, 9, '00'O);</span><br><span> </span><br><span> /* Send RSL PAGING COMMAND */</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi_enc, i mod 4)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi, i mod 4)));</span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_PAG_REQ(0, t_mi_lv))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_PAG_REQ(0, mi_lv_enc))) {</span><br><span> }</span><br><span> [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_PAG_REQ)) {</span><br><span> Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected PAGING REQ");</span><br><span>diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn</span><br><span>index f905973..ff0e2e5 100644</span><br><span>--- a/library/RSL_Types.ttcn</span><br><span>+++ b/library/RSL_Types.ttcn</span><br><span>@@ -16,6 +16,8 @@</span><br><span> import from General_Types all;</span><br><span> import from Osmocom_Types all;</span><br><span> import from GSM_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from MobileL3_CommonIE_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from L3_Templates all;</span><br><span> </span><br><span> /* Section 9.1 */</span><br><span> type enumerated RSL_MessageGroup {</span><br><span>@@ -819,7 +821,7 @@</span><br><span> uint8_t smscb_chan_ind,</span><br><span> RSL_IE_RequestRef req_ref,</span><br><span> RSL_LV full_imm_ass_info,</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_LV ms_identity,</span><br><span style="color: hsl(120, 100%, 40%);">+ MobileIdentityLV ms_identity,</span><br><span> </span><br><span> uint16_t ipa_conn_id,</span><br><span> uint16_t ipa_local_port,</span><br><span>@@ -1677,23 +1679,23 @@</span><br><span> }</span><br><span> </span><br><span> /* 8.5.5 BSC -> BTS */</span><br><span style="color: hsl(0, 100%, 40%);">- template RSL_Message tr_RSL_PAGING_CMD(template octetstring identity, template uint3_t tn := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template RSL_Message tr_RSL_PAGING_CMD(template MobileIdentityV mi, template uint3_t tn := ?) := {</span><br><span> msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false),</span><br><span> msg_type := RSL_MT_PAGING_CMD,</span><br><span> ies := {</span><br><span> tr_RSL_IE(RSL_IE_Body:{chan_nr := t_RslChanNr_PCH_AGCH(tn)}),</span><br><span> tr_RSL_IE(RSL_IE_Body:{paging_group := ?}),</span><br><span style="color: hsl(0, 100%, 40%);">- tr_RSL_IE(RSL_IE_Body:{ms_identity := tr_RSL_LV(identity)}),</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_RSL_IE(RSL_IE_Body:{ms_identity := tr_MI_LV(mi)}),</span><br><span> * /* opt: channel needed, eMLPP prio */</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) RSL_Message ts_RSL_PAGING_CMD(octetstring identity, uint8_t pg, uint3_t tn := 0) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RSL_Message ts_RSL_PAGING_CMD(MobileIdentityV mi, uint8_t pg, uint3_t tn := 0) := {</span><br><span> msg_disc := ts_RSL_MsgDisc(RSL_MDISC_CCHAN, false),</span><br><span> msg_type := RSL_MT_PAGING_CMD,</span><br><span> ies := {</span><br><span> t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := ts_RslChanNr_PCH_AGCH(tn)}),</span><br><span> t_RSL_IE(RSL_IE_PAGING_GROUP, RSL_IE_Body:{paging_group := pg}),</span><br><span style="color: hsl(0, 100%, 40%);">- t_RSL_IE(RSL_IE_MS_IDENTITY, RSL_IE_Body:{ms_identity := ts_RSL_LV(identity)})</span><br><span style="color: hsl(120, 100%, 40%);">+ t_RSL_IE(RSL_IE_MS_IDENTITY, RSL_IE_Body:{ms_identity := ts_MI_LV(mi)})</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17646">change 17646</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-ttcn3-hacks/+/17646"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5436dcbbc961d5b572e10e4f1a3f806d252d7818 </div>
<div style="display:none"> Gerrit-Change-Number: 17646 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>