<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17639">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/GSM_RR_Types: do not duplicate Mobile Identity records<br><br>All the records related to Mobile Identity IE (see 3GPP TS 24.008,<br>section 10.5.1.4) are defined in [1], so there is no real need to<br>dumplicate them. Moreover, most of the related templates in<br>library/L3_Templates.ttcn are based on these records.<br><br>[1] titan.ProtocolModules.MobileL3_v13.4.0/src/MobileL3_CommonIE_Types.ttcn<br><br>Change-Id: I27c2743c59db770d6f7e9447dc8c1f539b228ced<br>---<br>M bsc/BSC_Tests.ttcn<br>M bts/BTS_Tests.ttcn<br>M bts/BTS_Tests_SMSCB.ttcn<br>M library/BSSGP_Types.ttcn<br>M library/GSM_RR_Types.ttcn<br>M library/L3_Templates.ttcn<br>M msc/BSC_ConnectionHandler.ttcn<br>M pcu/PCU_Tests_RAW.ttcn<br>M sgsn/SGSN_Tests.ttcn<br>9 files changed, 33 insertions(+), 71 deletions(-)<br><br></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 d020d95..de7102e 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -1301,7 +1301,7 @@</span><br><span> template 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%);">- var MobileIdentity mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME (unused): var MobileIdentity mi; */</span><br><span> var template octetstring id_enc; /* FIXME */</span><br><span> var RSL_Message rx_rsl;</span><br><span> var integer paging_group := hex2int(imsi[lengthof(imsi)-1]);</span><br><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 46c9647..3018bca 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -2979,7 +2979,7 @@</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> /* build mobile Identity */</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV mi;</span><br><span> if (cfg.use_tmsi) {</span><br><span> mi := valueof(ts_MI_TMSI_LV(f_rnd_octstring(4)));</span><br><span> } else {</span><br><span>@@ -4570,7 +4570,7 @@</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 MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV mi;</span><br><span> timer T := 3.0;</span><br><span> if (i < 50) {</span><br><span> mi := valueof(ts_MI_TMSI_LV(f_rnd_octstring(4)));</span><br><span>diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>index 292205a..ebd8d0f 100644</span><br><span>--- a/bts/BTS_Tests_SMSCB.ttcn</span><br><span>+++ b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>@@ -894,12 +894,14 @@</span><br><span> },</span><br><span> page_mode := PAGE_MODE_NORMAL,</span><br><span> mi1 := {</span><br><span style="color: hsl(0, 100%, 40%);">- len := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- mi := {</span><br><span style="color: hsl(0, 100%, 40%);">- unused := {</span><br><span style="color: hsl(0, 100%, 40%);">- pad := '1111'B,</span><br><span style="color: hsl(0, 100%, 40%);">- odd := false,</span><br><span style="color: hsl(0, 100%, 40%);">- mi_type := MI_TYPE_NONE</span><br><span style="color: hsl(120, 100%, 40%);">+ lengthIndicator := 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ mobileIdentityV := {</span><br><span style="color: hsl(120, 100%, 40%);">+ typeOfIdentity := '000'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ oddEvenInd_identity := {</span><br><span style="color: hsl(120, 100%, 40%);">+ no_identity := {</span><br><span style="color: hsl(120, 100%, 40%);">+ oddevenIndicator := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ fillerDigits := 'F'H</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> },</span><br><span>diff --git a/library/BSSGP_Types.ttcn b/library/BSSGP_Types.ttcn</span><br><span>index d51bb6d..e9984d8 100644</span><br><span>--- a/library/BSSGP_Types.ttcn</span><br><span>+++ b/library/BSSGP_Types.ttcn</span><br><span>@@ -245,9 +245,9 @@</span><br><span> BssgpCause cause, /* 11.3.8 */</span><br><span> BssgpCellId cell_id, /* 11.3.9 */</span><br><span> DrxParameter drx_parameter, /* 10.3.11 */</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentity imsi, /* 11.3.14 */</span><br><span style="color: hsl(120, 100%, 40%);">+ MobileIdentityV imsi, /* 11.3.14 */</span><br><span> LocationAreaIdentification lai, /* 11.3.17 */</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentity mobile_id, /* 11.3.20 */</span><br><span style="color: hsl(120, 100%, 40%);">+ MobileIdentityV mobile_id, /* 11.3.20 */</span><br><span> BssgpPduLifetime pdu_lifetime, /* 11.3.25 */</span><br><span> BssgpPriority priority, /* 11.3.27 */</span><br><span> BssgpQosProfile qos_profile, /* 11.3.28 */</span><br><span>@@ -388,10 +388,14 @@</span><br><span> len := 4,</span><br><span> u := {</span><br><span> mobile_id := {</span><br><span style="color: hsl(0, 100%, 40%);">- imsi := {</span><br><span style="color: hsl(0, 100%, 40%);">- mi_type := MI_TYPE_IMSI,</span><br><span style="color: hsl(0, 100%, 40%);">- odd := true, /* IMSI has 15 digits */</span><br><span style="color: hsl(0, 100%, 40%);">- digits := imsi</span><br><span style="color: hsl(120, 100%, 40%);">+ typeOfIdentity := MI_TYPE_IMSI,</span><br><span style="color: hsl(120, 100%, 40%);">+ oddEvenInd_identity := {</span><br><span style="color: hsl(120, 100%, 40%);">+ imsi := {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: introduce generic tr_IMSI_L3 */</span><br><span style="color: hsl(120, 100%, 40%);">+ oddevenIndicator := true, /* IMSI has 15 digits */</span><br><span style="color: hsl(120, 100%, 40%);">+ digits := imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ fillerDigit := '1111'B</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn</span><br><span>index 9fd7733..878166b 100644</span><br><span>--- a/library/GSM_RR_Types.ttcn</span><br><span>+++ b/library/GSM_RR_Types.ttcn</span><br><span>@@ -16,6 +16,7 @@</span><br><span> import from Osmocom_Types all;</span><br><span> import from GSM_Types all;</span><br><span> import from RLCMAC_CSN1_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+ import from MobileL3_CommonIE_Types all;</span><br><span> </span><br><span> /* Table 10.4.1 of Section 10.4 / 3GPP TS 44.018 */</span><br><span> type enumerated RrMessageType {</span><br><span>@@ -205,51 +206,6 @@</span><br><span> MI_TYPE_TMGI</span><br><span> } with { variant "FIELDLENGTH(3)" };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- type record MobileIdentityBCD {</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentityType mi_type (MI_TYPE_IMSI, MI_TYPE_IMEI, MI_TYPE_IMEISV),</span><br><span style="color: hsl(0, 100%, 40%);">- boolean odd,</span><br><span style="color: hsl(0, 100%, 40%);">- hexstring digits</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "FIELDORDER(lsb)" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- type record MobileIdentityTMSI {</span><br><span style="color: hsl(0, 100%, 40%);">- BIT4 pad ('1111'B),</span><br><span style="color: hsl(0, 100%, 40%);">- boolean odd (false),</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentityType mi_type (MI_TYPE_TMSI),</span><br><span style="color: hsl(0, 100%, 40%);">- GsmTmsi tmsi</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "FIELDORDER(lsb)" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- type record MobileIdentityNone {</span><br><span style="color: hsl(0, 100%, 40%);">- BIT4 pad ('1111'B),</span><br><span style="color: hsl(0, 100%, 40%);">- boolean odd (false),</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentityType mi_type (MI_TYPE_NONE)</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "FIELDORDER(lsb)" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- type union MobileIdentity {</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentityBCD imsi,</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentityBCD imei,</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentityBCD imeisv,</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentityTMSI tmsi,</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentityNone unused</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "TAG(imsi, mi_type = MI_TYPE_IMSI;</span><br><span style="color: hsl(0, 100%, 40%);">- imei, mi_type = MI_TYPE_IMEI;</span><br><span style="color: hsl(0, 100%, 40%);">- imeisv, mi_type = MI_TYPE_IMEISV;</span><br><span style="color: hsl(0, 100%, 40%);">- tmsi, mi_type = MI_TYPE_TMSI;</span><br><span style="color: hsl(0, 100%, 40%);">- unused, mi_type = MI_TYPE_NONE)"</span><br><span style="color: hsl(0, 100%, 40%);">- variant "FIELDORDER(lsb)"</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* TS 24.008 10.5.1.4 "Mobile Identity" */</span><br><span style="color: hsl(0, 100%, 40%);">- type record MobileIdentityLV {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t len,</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentity mi</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant (len) "LENGTHTO(mi)" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- type record MobileIdentityTLV {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tag,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t len,</span><br><span style="color: hsl(0, 100%, 40%);">- MobileIdentity mi</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant (len) "LENGTHTO(mi)" };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* TS 24.008 10.5.1.5 */</span><br><span> type record MsClassmark1 {</span><br><span> BIT1 spare,</span><br><span>@@ -762,7 +718,7 @@</span><br><span> MobileIdentityLV mi1,</span><br><span> MobileIdentityTLV mi2 optional,</span><br><span> RestOctets rest_octets</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "TAG(mi2, tag = 23)" };</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { variant "TAG(mi2, elementIdentifier = '0010111'B)" };</span><br><span> </span><br><span> /* 9.1.23 */</span><br><span> type record PagingRequestType2 {</span><br><span>@@ -772,7 +728,7 @@</span><br><span> GsmTmsi mi2,</span><br><span> MobileIdentityTLV mi3 optional,</span><br><span> RestOctets rest_octets</span><br><span style="color: hsl(0, 100%, 40%);">- } with { variant "TAG(mi3, tag = 23)" };</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { variant "TAG(mi3, elementIdentifier = '0010111'B)" };</span><br><span> </span><br><span> /* 9.1.24 */</span><br><span> type record length(4) of GsmTmsi GsmTmsi4;</span><br><span>diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn</span><br><span>index cf7b9d9..af4a573 100644</span><br><span>--- a/library/L3_Templates.ttcn</span><br><span>+++ b/library/L3_Templates.ttcn</span><br><span>@@ -315,7 +315,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Template for receiving a Paging Request Type1 message with a given TMSI in the first mobile identity. */</span><br><span style="color: hsl(0, 100%, 40%);">-template MobileL3_CommonIE_Types.MobileIdentityLV tr_PAGING_REQ1_MI1_TMSI(octetstring tmsi) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template MobileIdentityLV tr_PAGING_REQ1_MI1_TMSI(octetstring tmsi) := {</span><br><span> lengthIndicator := 5,</span><br><span> mobileIdentityV := {</span><br><span> typeOfIdentity := '100'B,</span><br><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index c21bcd9..623dae9 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -442,7 +442,7 @@</span><br><span> {</span><br><span> var PDU_DTAP_MT dtap_mt;</span><br><span> var GSUP_PDU gsup_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV mi;</span><br><span> </span><br><span> if (not g_pars.net.expect_imei) {</span><br><span> return</span><br><span>@@ -480,7 +480,7 @@</span><br><span> {</span><br><span> var PDU_DTAP_MT dtap_mt;</span><br><span> var GSUP_PDU gsup_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV mi;</span><br><span> </span><br><span> if (not g_pars.net.expect_imei_early) {</span><br><span> return</span><br><span>diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn</span><br><span>index 62ebcd6..6e11889 100644</span><br><span>--- a/pcu/PCU_Tests_RAW.ttcn</span><br><span>+++ b/pcu/PCU_Tests_RAW.ttcn</span><br><span>@@ -1386,7 +1386,7 @@</span><br><span> var RlcmacDlBlock dl_block;</span><br><span> var boolean ok;</span><br><span> var OCT4 tlli := '00000001'O;</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV mi;</span><br><span> var octetstring mi_enc_lv;</span><br><span> var hexstring imsi := f_gen_imsi(42);</span><br><span> </span><br><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index eb1fff2..6c963fa 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -553,7 +553,7 @@</span><br><span> }</span><br><span> </span><br><span> altstep as_mm_identity(integer ran_index := 0) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV mi;</span><br><span> [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_ID_REQ('001'B)) {</span><br><span> mi := valueof(ts_MI_IMSI_LV(g_pars.imsi));</span><br><span> f_send_l3(ts_GMM_ID_RESP(mi), ran_index);</span><br><span>@@ -740,7 +740,7 @@</span><br><span> }</span><br><span> </span><br><span> /* return a MobileIdentityLV: P-TMSI if we have one, IMSI otherwise */</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_mi_get_lv() runs on BSSGP_ConnHdlr return MobileL3_CommonIE_Types.MobileIdentityLV {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_mi_get_lv() runs on BSSGP_ConnHdlr return MobileIdentityLV {</span><br><span> if (ispresent(g_pars.p_tmsi)) {</span><br><span> return valueof(ts_MI_TMSI_LV(g_pars.p_tmsi));</span><br><span> } else {</span><br><span>@@ -2153,7 +2153,7 @@</span><br><span> /* Attempt an attach, but loose the Identification Request (IMEI) */</span><br><span> private function f_TC_attach_no_imei_response(charstring id) runs on BSSGP_ConnHdlr {</span><br><span> var integer count_req := 0;</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV mi;</span><br><span> </span><br><span> f_send_l3(ts_GMM_ATTACH_REQ(f_mi_get_lv(), f_random_RAI(), true, false, omit, omit));</span><br><span> </span><br><span>@@ -2199,7 +2199,7 @@</span><br><span> /* Attempt an attach, but loose the Identification Request (IMSI) */</span><br><span> private function f_TC_attach_no_imsi_response(charstring id) runs on BSSGP_ConnHdlr {</span><br><span> var integer count_req := 0;</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV mi;</span><br><span> </span><br><span> /* set p_tmsi to use it in Attach Req via f_mi_get_lv() */</span><br><span> g_pars.p_tmsi := 'c0000035'O;</span><br><span>@@ -2479,7 +2479,7 @@</span><br><span> </span><br><span> private function f_TC_attach_gmm_attach_req_while_gmm_attach(charstring id) runs on BSSGP_ConnHdlr {</span><br><span> var integer count_req := 0;</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV mi;</span><br><span> var RoutingAreaIdentificationV rand_rai := f_random_RAI();</span><br><span> var PDU_L3_SGSN_MS l3_mt;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17639">change 17639</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/+/17639"/><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: I27c2743c59db770d6f7e9447dc8c1f539b228ced </div>
<div style="display:none"> Gerrit-Change-Number: 17639 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>