<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14550">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/ranap: enrich both t(s|r)_RANAP_DirectTransfer templates<br><br>Instead of having two similar variants of RANAP_DirectTransfer:<br><br> - t(s|r)_RANAP_DirectTransfer, and<br> - t(s|r)_RANAP_DirectTransferSAPI,<br><br>let's make the first one more flexible, and drop the last one.<br>This is achieved by introducing two supplementary functions:<br><br> - f_gen_ts_dt_ies(), and<br> - f_gen_tr_dt_ies,<br><br>which dynamically compose DirectTransfer.protocolIEs.<br><br>Change-Id: I7333d08c4d5a72159bfbd50fe8e7b1084cd61b9e<br>---<br>M library/RAN_Emulation.ttcnpp<br>M library/ranap/RANAP_Templates.ttcn<br>2 files changed, 84 insertions(+), 94 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/50/14550/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp</span><br><span>index de5b7f3..c7f67c4 100644</span><br><span>--- a/library/RAN_Emulation.ttcnpp</span><br><span>+++ b/library/RAN_Emulation.ttcnpp</span><br><span>@@ -1097,12 +1097,7 @@</span><br><span> #ifdef RAN_EMULATION_RANAP</span><br><span> case (RAN_PROTOCOL_RANAP) {</span><br><span> var RANAP_PDU ranap;</span><br><span style="color: hsl(0, 100%, 40%);">- if (false /* SAPI */) {</span><br><span style="color: hsl(0, 100%, 40%);">- var RANAP_IEs.SAPI sapi := sapi_0;</span><br><span style="color: hsl(0, 100%, 40%);">- ranap := valueof(ts_RANAP_DirectTransferSAPI(l3_enc, sapi));</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ranap := valueof(ts_RANAP_DirectTransfer(l3_enc));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ ranap := valueof(ts_RANAP_DirectTransfer(l3_enc, sapi := sapi_0));</span><br><span> RANAP.send(ts_RANAP_DATA_req(sccp_conn_id, ranap));</span><br><span> }</span><br><span> #endif</span><br><span>diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn</span><br><span>index e55f212..fdced83 100644</span><br><span>--- a/library/ranap/RANAP_Templates.ttcn</span><br><span>+++ b/library/ranap/RANAP_Templates.ttcn</span><br><span>@@ -998,25 +998,94 @@</span><br><span> * Direct Transfer</span><br><span> *****************************************************************************************************/</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_gen_ts_dt_ies(template (value) NAS_PDU nas,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (omit) SAPI sapi,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) DirectTransfer.protocolIEs opt_ies)</span><br><span style="color: hsl(120, 100%, 40%);">+return DirectTransfer.protocolIEs {</span><br><span style="color: hsl(120, 100%, 40%);">+ var DirectTransfer.protocolIEs ies := {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NAS PDU is mandatory */</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ id := id_NAS_PDU,</span><br><span style="color: hsl(120, 100%, 40%);">+ criticality := ignore,</span><br><span style="color: hsl(120, 100%, 40%);">+ value_ := {</span><br><span style="color: hsl(120, 100%, 40%);">+ nAS_PDU := valueof(nas)</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Optional IEs, e.g. LAI, RAC, SAI */</span><br><span style="color: hsl(120, 100%, 40%);">+ ies := ies & valueof(opt_ies);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Optional SAPI is the last IE */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isvalue(sapi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ies := ies & {{</span><br><span style="color: hsl(120, 100%, 40%);">+ id := id_SAPI,</span><br><span style="color: hsl(120, 100%, 40%);">+ criticality := ignore,</span><br><span style="color: hsl(120, 100%, 40%);">+ value_ := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sAPI := valueof(sapi)</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return ies;</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 function f_gen_tr_dt_ies(template NAS_PDU nas,</span><br><span style="color: hsl(120, 100%, 40%);">+ template SAPI sapi,</span><br><span style="color: hsl(120, 100%, 40%);">+ template DirectTransfer.protocolIEs opt_ies)</span><br><span style="color: hsl(120, 100%, 40%);">+return template DirectTransfer.protocolIEs {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template DirectTransfer.protocolIEs ies := {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NAS PDU is mandatory */</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ id := id_NAS_PDU,</span><br><span style="color: hsl(120, 100%, 40%);">+ criticality := ignore,</span><br><span style="color: hsl(120, 100%, 40%);">+ value_ := {</span><br><span style="color: hsl(120, 100%, 40%);">+ nAS_PDU := nas</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Optional IEs start from index 1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer idx := 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Optional IEs, e.g. LAI, RAC, SAI */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (istemplatekind(opt_ies, "*")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ies[idx] := *;</span><br><span style="color: hsl(120, 100%, 40%);">+ idx := idx + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (not istemplatekind(opt_ies, "omit")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < lengthof(opt_ies); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ies[idx] := opt_ies[idx];</span><br><span style="color: hsl(120, 100%, 40%);">+ idx := idx + 1;</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%);">+ /* Optional SAPI is the last IE */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (istemplatekind(sapi, "*")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ies[idx] := *;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (not istemplatekind(sapi, "omit")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ies[idx] := {</span><br><span style="color: hsl(120, 100%, 40%);">+ id := id_SAPI,</span><br><span style="color: hsl(120, 100%, 40%);">+ criticality := ignore,</span><br><span style="color: hsl(120, 100%, 40%);">+ value_ := {</span><br><span style="color: hsl(120, 100%, 40%);">+ sAPI := sapi</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return ies;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> template (value) RANAP_PDU</span><br><span> ts_RANAP_DirectTransfer(template (value) NAS_PDU nas,</span><br><span style="color: hsl(0, 100%, 40%);">- /* template DirectTransfer.protocolIEs ies := {}, */</span><br><span style="color: hsl(120, 100%, 40%);">+ template (omit) SAPI sapi := sapi_0,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) DirectTransfer.protocolIEs ies := {},</span><br><span> template (omit) DirectTransfer.protocolExtensions exts := omit) := {</span><br><span> initiatingMessage := {</span><br><span> procedureCode := id_DirectTransfer,</span><br><span> criticality := ignore,</span><br><span> value_ := {</span><br><span> directTransfer := {</span><br><span style="color: hsl(0, 100%, 40%);">- protocolIEs := {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- id := id_NAS_PDU,</span><br><span style="color: hsl(0, 100%, 40%);">- criticality := ignore,</span><br><span style="color: hsl(0, 100%, 40%);">- value_ := {</span><br><span style="color: hsl(0, 100%, 40%);">- nAS_PDU := nas</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%);">- /* LAI, RAC, SAI */</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(120, 100%, 40%);">+ protocolIEs := f_gen_ts_dt_ies(nas, sapi, ies),</span><br><span> protocolExtensions := exts</span><br><span> }</span><br><span> }</span><br><span>@@ -1025,88 +1094,14 @@</span><br><span> template RANAP_PDU</span><br><span> tr_RANAP_DirectTransfer(template NAS_PDU nas,</span><br><span> template SAPI sapi := sapi_0,</span><br><span style="color: hsl(0, 100%, 40%);">- /* template DirectTransfer.protocolIEs ies := {}, */</span><br><span style="color: hsl(120, 100%, 40%);">+ template DirectTransfer.protocolIEs ies := *,</span><br><span> template DirectTransfer.protocolExtensions exts := *) := {</span><br><span> initiatingMessage := {</span><br><span> procedureCode := id_DirectTransfer,</span><br><span> criticality := ignore,</span><br><span> value_ := {</span><br><span> directTransfer := {</span><br><span style="color: hsl(0, 100%, 40%);">- protocolIEs := {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- id := id_NAS_PDU,</span><br><span style="color: hsl(0, 100%, 40%);">- criticality := ignore,</span><br><span style="color: hsl(0, 100%, 40%);">- value_ := {</span><br><span style="color: hsl(0, 100%, 40%);">- nAS_PDU := nas</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%);">- * /* LAI, RAC, SAI */</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- protocolExtensions := exts</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%);">- }</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%);">-template (value) RANAP_PDU</span><br><span style="color: hsl(0, 100%, 40%);">-ts_RANAP_DirectTransferSAPI(template (value) NAS_PDU nas,</span><br><span style="color: hsl(0, 100%, 40%);">- template (value) SAPI sapi := sapi_0,</span><br><span style="color: hsl(0, 100%, 40%);">- /* template DirectTransfer.protocolIEs ies := {}, */</span><br><span style="color: hsl(0, 100%, 40%);">- template (omit) DirectTransfer.protocolExtensions exts := omit) := {</span><br><span style="color: hsl(0, 100%, 40%);">- initiatingMessage := {</span><br><span style="color: hsl(0, 100%, 40%);">- procedureCode := id_DirectTransfer,</span><br><span style="color: hsl(0, 100%, 40%);">- criticality := ignore,</span><br><span style="color: hsl(0, 100%, 40%);">- value_ := {</span><br><span style="color: hsl(0, 100%, 40%);">- directTransfer := {</span><br><span style="color: hsl(0, 100%, 40%);">- protocolIEs := {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- id := id_NAS_PDU,</span><br><span style="color: hsl(0, 100%, 40%);">- criticality := ignore,</span><br><span style="color: hsl(0, 100%, 40%);">- value_ := {</span><br><span style="color: hsl(0, 100%, 40%);">- nAS_PDU := nas</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%);">- /* LAI, RAC, SAI */</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- id := id_SAPI,</span><br><span style="color: hsl(0, 100%, 40%);">- criticality := ignore,</span><br><span style="color: hsl(0, 100%, 40%);">- value_ := {</span><br><span style="color: hsl(0, 100%, 40%);">- sAPI := sapi</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%);">- },</span><br><span style="color: hsl(0, 100%, 40%);">- protocolExtensions := exts</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%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-template RANAP_PDU</span><br><span style="color: hsl(0, 100%, 40%);">-tr_RANAP_DirectTransferSAPI(template NAS_PDU nas,</span><br><span style="color: hsl(0, 100%, 40%);">- template SAPI sapi := sapi_0,</span><br><span style="color: hsl(0, 100%, 40%);">- /* template DirectTransfer.protocolIEs ies := {}, */</span><br><span style="color: hsl(0, 100%, 40%);">- template DirectTransfer.protocolExtensions exts := *) := {</span><br><span style="color: hsl(0, 100%, 40%);">- initiatingMessage := {</span><br><span style="color: hsl(0, 100%, 40%);">- procedureCode := id_DirectTransfer,</span><br><span style="color: hsl(0, 100%, 40%);">- criticality := ignore,</span><br><span style="color: hsl(0, 100%, 40%);">- value_ := {</span><br><span style="color: hsl(0, 100%, 40%);">- directTransfer := {</span><br><span style="color: hsl(0, 100%, 40%);">- protocolIEs := {</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- id := id_NAS_PDU,</span><br><span style="color: hsl(0, 100%, 40%);">- criticality := ignore,</span><br><span style="color: hsl(0, 100%, 40%);">- value_ := {</span><br><span style="color: hsl(0, 100%, 40%);">- nAS_PDU := nas</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%);">- *, /* LAI, RAC, SAI */</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- id := id_SAPI,</span><br><span style="color: hsl(0, 100%, 40%);">- criticality := ignore,</span><br><span style="color: hsl(0, 100%, 40%);">- value_ := {</span><br><span style="color: hsl(0, 100%, 40%);">- sAPI := sapi</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%);">- },</span><br><span style="color: hsl(120, 100%, 40%);">+ protocolIEs := f_gen_tr_dt_ies(nas, sapi, ies),</span><br><span> protocolExtensions := exts</span><br><span> }</span><br><span> }</span><br><span>@@ -1412,7 +1407,7 @@</span><br><span> var integer i;</span><br><span> </span><br><span> /* InitialUE message has no SAPI */</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(ranap, tr_RANAP_DirectTransfer(?, ?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(ranap, tr_RANAP_DirectTransfer(?, omit))) {</span><br><span> var DirectTransfer.protocolIEs ies := ranap.initiatingMessage.value_.directTransfer.protocolIEs;</span><br><span> for (i := 0; i < lengthof(ies); i := i+1) {</span><br><span> if (ies[i].id == id_SAPI) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14550">change 14550</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/+/14550"/><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: I7333d08c4d5a72159bfbd50fe8e7b1084cd61b9e </div>
<div style="display:none"> Gerrit-Change-Number: 14550 </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>