<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20997">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library: fix Repeated Page Info IE in PacketPagingReq<br><br>Change-Id: I39e8e3991cc248602460b7f162a0b57c2925315f<br>Related: OS#4838<br>---<br>M library/RLCMAC_CSN1_Types.ttcn<br>M library/RLCMAC_Templates.ttcn<br>M pcu/GPRS_Components.ttcn<br>M pcu/PCU_Tests.ttcn<br>4 files changed, 28 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>index cc1ae22..5ef7c44 100644</span><br><span>--- a/library/RLCMAC_CSN1_Types.ttcn</span><br><span>+++ b/library/RLCMAC_CSN1_Types.ttcn</span><br><span>@@ -416,18 +416,22 @@</span><br><span> } with {</span><br><span> variant "TAG(ps, presence = '0'B; cs, presence = '1'B)"</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+ type record RepeatedPageInfoItem {</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 presence,</span><br><span style="color: hsl(120, 100%, 40%);">+ PageInfo item</span><br><span style="color: hsl(120, 100%, 40%);">+ } with { variant "PRESENCE(presence = '1'B)" };</span><br><span style="color: hsl(120, 100%, 40%);">+ type record of RepeatedPageInfoItem RepeatedPageInfo;</span><br><span> type record PacketPagingReq {</span><br><span> PageMode page_mode,</span><br><span> BIT1 persistence_levels_present,</span><br><span> PersistenceLevels persistence_levels optional,</span><br><span> BIT1 nln_present,</span><br><span> uint2_t nln optional,</span><br><span style="color: hsl(0, 100%, 40%);">- BIT1 repeated_pageinfo_present,</span><br><span style="color: hsl(0, 100%, 40%);">- PageInfo repeated_pageinfo optional</span><br><span style="color: hsl(120, 100%, 40%);">+ RepeatedPageInfo repeated_pageinfo optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ BIT1 repeated_pageinfo_term ('0'B)</span><br><span> } with {</span><br><span> variant (persistence_levels) "PRESENCE(persistence_levels_present = '1'B)"</span><br><span> variant (nln) "PRESENCE(nln_present = '1'B)"</span><br><span style="color: hsl(0, 100%, 40%);">- variant (repeated_pageinfo) "PRESENCE(repeated_pageinfo_present = '1'B)"</span><br><span> };</span><br><span> </span><br><span> /* 12.26 Extension Bits IE */</span><br><span>diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn</span><br><span>index 5bdc17d..edf6516 100644</span><br><span>--- a/library/RLCMAC_Templates.ttcn</span><br><span>+++ b/library/RLCMAC_Templates.ttcn</span><br><span>@@ -642,8 +642,8 @@</span><br><span> persistence_levels := *,</span><br><span> nln_present := ?,</span><br><span> nln := *,</span><br><span style="color: hsl(0, 100%, 40%);">- repeated_pageinfo_present := ?,</span><br><span style="color: hsl(0, 100%, 40%);">- repeated_pageinfo := *</span><br><span style="color: hsl(120, 100%, 40%);">+ repeated_pageinfo := *,</span><br><span style="color: hsl(120, 100%, 40%);">+ repeated_pageinfo_term := '0'B</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn</span><br><span>index e6406b7..3778b2f 100644</span><br><span>--- a/pcu/GPRS_Components.ttcn</span><br><span>+++ b/pcu/GPRS_Components.ttcn</span><br><span>@@ -917,11 +917,25 @@</span><br><span> </span><br><span> function f_pkt_paging_match_tmsi(in PacketPagingReq req, template GsmTmsi tmsi)</span><br><span> runs on MS_BTS_IFACE_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- if (not match(req.repeated_pageinfo.cs.tmsi, tmsi)) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Mobile Identity (TMSI/P-TMSI) mismatch: ",</span><br><span style="color: hsl(0, 100%, 40%);">- "expected: ", tmsi, "got: ", req.repeated_pageinfo.cs.tmsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ispresent(req.repeated_pageinfo)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Packet Paging Request without MIs?!?");</span><br><span> f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < lengthof(req.repeated_pageinfo); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PageInfo info := req.repeated_pageinfo[i].item;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ischosen(info.cs))</span><br><span style="color: hsl(120, 100%, 40%);">+ { continue; }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(info.cs.tmsi, tmsi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Mobile Identity (TMSI/P-TMSI) ", tmsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ " is not present in ", req.repeated_pageinfo);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown(__BFILE__, __LINE__);</span><br><span> }</span><br><span> </span><br><span> }</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index df075bc..411890c 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -1702,7 +1702,8 @@</span><br><span> </span><br><span> private function f_pkt_paging_match_imsi(in PacketPagingReq req, hexstring imsi)</span><br><span> runs on RAW_PCU_Test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileIdentityLV_Paging mi_lv := req.repeated_pageinfo.cs.mobile_identity;</span><br><span style="color: hsl(120, 100%, 40%);">+ var PageInfo info := req.repeated_pageinfo[0].item;</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileIdentityLV_Paging mi_lv := info.cs.mobile_identity;</span><br><span> var MobileIdentityV mi := dec_MobileIdentityV(mi_lv.mobile_id);</span><br><span> </span><br><span> if (mi_lv.len != 8) { /* 8 octets: type of ID (3 bits) + even/odd flag (1 bit) + 15 BCD-encoded digits (60 bits) */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20997">change 20997</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/+/20997"/><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: I39e8e3991cc248602460b7f162a0b57c2925315f </div>
<div style="display:none"> Gerrit-Change-Number: 20997 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </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>