<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18027">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;">BTS: manually compose Rest Octets for SI Type 3 and 4<br><br>Finally, we can get rid of hard-coded octetstrings and control<br>every field of the Rest Octets we're sending to the IUT.<br><br>Note that template 'ts_SI4_default' did not contain any Rest<br>Octets at all, thus the GPRS indicator was (and still is)<br>absent. This will be fixed in a follow up change.<br><br>Change-Id: I0a95b34b495267edf1f48692e24fcd5ede8ccdd1<br>Signed-off-by: Vadim Yanitskiy <axilirator@gmail.com><br>---<br>M bts/BTS_Tests.ttcn<br>M library/GSM_RestOctets.ttcn<br>M library/Osmocom_Types.ttcn<br>3 files changed, 78 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 6f43a44..3ed3655 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -225,6 +225,28 @@</span><br><span> lac := 42</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private template (value) GPRSIndicator ts_GPRSIndicator_def := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ra_colour := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ si13_pos := '0'B</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%);">+private template (value) SI3RestOctets ts_SI3RestOctets_def</span><br><span style="color: hsl(120, 100%, 40%);">+modifies ts_SI3RestOctets := {</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ind := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_H,</span><br><span style="color: hsl(120, 100%, 40%);">+ ind := ts_GPRSIndicator_def</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%);">+private template (value) SI4RestOctets ts_SI4RestOctets_def</span><br><span style="color: hsl(120, 100%, 40%);">+modifies ts_SI4RestOctets := {</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ind := {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: GPRS Indicator shall be present here too */</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ ind := omit</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> /* Default SYSTEM INFORMATION 3 */</span><br><span> template (value) SystemInformation ts_SI3_default := {</span><br><span> header := ts_RrHeader(SYSTEM_INFORMATION_TYPE_3, 18),</span><br><span>@@ -251,7 +273,7 @@</span><br><span> },</span><br><span> cell_sel_par := ts_CellSelPar_default,</span><br><span> rach_control := ts_RachCtrl_default,</span><br><span style="color: hsl(0, 100%, 40%);">- rest_octets := '2C2B2B2B'O /* GPRS present */</span><br><span style="color: hsl(120, 100%, 40%);">+ rest_octets := enc_SI3RestOctets(valueof(ts_SI3RestOctets_def))</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -276,7 +298,7 @@</span><br><span> rach_control := ts_RachCtrl_default,</span><br><span> cbch_chan_desc := omit,</span><br><span> cbch_mobile_alloc := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- rest_octets := ''O</span><br><span style="color: hsl(120, 100%, 40%);">+ rest_octets := enc_SI4RestOctets(valueof(ts_SI4RestOctets_def))</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn</span><br><span>index 045d177..531528c 100644</span><br><span>--- a/library/GSM_RestOctets.ttcn</span><br><span>+++ b/library/GSM_RestOctets.ttcn</span><br><span>@@ -142,4 +142,54 @@</span><br><span> with { extension "prototype(convert) decode(RAW)" };</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Basic templates to be extended in place */</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) SI3RestOctets ts_SI3RestOctets := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sel_params := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ params := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ pwr_offset := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ offset := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ si_2ter_ind := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ early_cm_ind := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ sched_where := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ where := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ind := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ ind := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ umts_early_cm_ind := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ si2_quater_ind := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ ind := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ iu_mode_ind := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ si21_ind := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ pos := omit</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%);">+template (value) SI4RestOctets ts_SI4RestOctets := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sel_params := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ params := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ pwr_offset := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ offset := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ind := {</span><br><span style="color: hsl(120, 100%, 40%);">+ presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ ind := omit</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ s_presence := CSN1_L,</span><br><span style="color: hsl(120, 100%, 40%);">+ s := omit</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> } with { encode "RAW"; variant "FIELDORDER(msb)" }</span><br><span>diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn</span><br><span>index 3b2ca17..16395df 100644</span><br><span>--- a/library/Osmocom_Types.ttcn</span><br><span>+++ b/library/Osmocom_Types.ttcn</span><br><span>@@ -40,6 +40,10 @@</span><br><span> const uint16_t c_UINT16_MAX := 65535;</span><br><span> const uint32_t c_UINT32_MAX := 4294967295;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* CSN.1 L/H placeholders */</span><br><span style="color: hsl(120, 100%, 40%);">+ const BIT1 CSN1_L := '0'B;</span><br><span style="color: hsl(120, 100%, 40%);">+ const BIT1 CSN1_H := '1'B;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type record Arfcn {</span><br><span> boolean pcs,</span><br><span> uint15_t arfcn</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18027">change 18027</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/+/18027"/><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: I0a95b34b495267edf1f48692e24fcd5ede8ccdd1 </div>
<div style="display:none"> Gerrit-Change-Number: 18027 </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: fixeria <axilirator@gmail.com> </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>