<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16962">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stp: Remove unneded copy of ConvertASPAddressToEncodedAddress_itu()<br><br>Since commit d0575c2fd816bb6a594cd21012ea1421434f3808, we are using a<br>forked version of titan.ProtocolEmulations.SCCP with a change to allow<br>us to run those function directly from its module, no need to copy them<br>anymore.<br><br>Change-Id: I5fe700bd751e1f8f432d052ae6a2f013c5b89580<br>---<br>M stp/STP_Tests.ttcn<br>1 file changed, 0 insertions(+), 87 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/62/16962/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests.ttcn</span><br><span>index 032a900..990518c 100644</span><br><span>--- a/stp/STP_Tests.ttcn</span><br><span>+++ b/stp/STP_Tests.ttcn</span><br><span>@@ -42,93 +42,6 @@</span><br><span> </span><br><span> const OCT1 c_M3UA_SI_SCCP := '03'O;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* copy+pasted from SCCP_Emulation.ttcn, where for some reason it is marked as "runs on SCCP_CT"</span><br><span style="color: hsl(0, 100%, 40%);">- * without depending on anything of that component */</span><br><span style="color: hsl(0, 100%, 40%);">- function ConvertASPAddressToEncodedAddress_itu( in SCCP_PAR_Address pl_ASPAddress)</span><br><span style="color: hsl(0, 100%, 40%);">- return SCCP_param_CPartyAddressEnc</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%);">- var SCCP_param_CPartyAddress_itu vl_PDUAddress; //structured fit to encoding</span><br><span style="color: hsl(0, 100%, 40%);">- var SCCP_param_CPartyAddressEnc vl_PDUAddressEncoded;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.addressIndicator.pointCodeIndic:=</span><br><span style="color: hsl(0, 100%, 40%);">- pl_ASPAddress.addressIndicator.pointCodeIndic;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.addressIndicator.ssnIndicator:=</span><br><span style="color: hsl(0, 100%, 40%);">- pl_ASPAddress.addressIndicator.ssnIndicator;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.addressIndicator.globalTitleIndic:=</span><br><span style="color: hsl(0, 100%, 40%);">- pl_ASPAddress.addressIndicator.globalTitleIndic;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.addressIndicator.routingIndicator:=</span><br><span style="color: hsl(0, 100%, 40%);">- pl_ASPAddress.addressIndicator.routingIndicator;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.addressIndicator.reserved:='0'B;</span><br><span style="color: hsl(0, 100%, 40%);">- // if (ischosen(pl_ASPAddress.signPointCode) ) not used because it is mandatory field (???)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- //----signPointCode handling</span><br><span style="color: hsl(0, 100%, 40%);">- if ( ispresent( pl_ASPAddress.signPointCode )) {</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.signPointCode :=</span><br><span style="color: hsl(0, 100%, 40%);">- '00'B&pl_ASPAddress.signPointCode;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.signPointCode := omit;</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%);">- //----subsystemNumber handling</span><br><span style="color: hsl(0, 100%, 40%);">- if ( ispresent( pl_ASPAddress.subsystemNumber ) ){</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.subsystemNumber := pl_ASPAddress.subsystemNumber;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.subsystemNumber :=omit;</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%);">- // --- globalTitle handling--</span><br><span style="color: hsl(0, 100%, 40%);">- if ( ispresent(pl_ASPAddress.globalTitle))</span><br><span style="color: hsl(0, 100%, 40%);">- {//startif1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- var SCCP_ASPfield_GlobalTitle tmpGT ;</span><br><span style="color: hsl(0, 100%, 40%);">- tmpGT := pl_ASPAddress.globalTitle;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ischosen(tmpGT.gti0001))</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0001.natureOfAddress:=tmpGT.gti0001.natureOfAddress;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0001.oddeven:=tmpGT.gti0001.oddeven;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0001.globalTitleAddress:=tmpGT.gti0001.globalTitleAddress;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- else if (ischosen(tmpGT.gti0010))</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0010.translationType:=tmpGT.gti0010.translationType;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0010.globalTitleAddress:=tmpGT.gti0010.globalTitleAddress;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- else if (ischosen(tmpGT.gti0011))</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0011.translationType:=tmpGT.gti0011.translationType;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0011.encodingScheme:=tmpGT.gti0011.encodingScheme;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0011.numberingPlan:=tmpGT.gti0011.numberingPlan;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0011.globalTitleAddress:=tmpGT.gti0011.globalTitleAddress;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- else if (ischosen(tmpGT.gti0100))</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0100.translationType:=tmpGT.gti0100.translationType;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0100.encodingScheme:=tmpGT.gti0100.encodingScheme;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0100.numberingPlan:=tmpGT.gti0100.numberingPlan;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0100.natureOfAddress:=tmpGT.gti0100.natureOfAddress;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0100.reserved:='0'B;</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle.gti0100.globalTitleAddress:=tmpGT.gti0100.globalTitleAddress;</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%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddress.globalTitle := omit;</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%);">- vl_PDUAddressEncoded.addr:= enc_PDU_SCCP_Address_itu( vl_PDUAddress);</span><br><span style="color: hsl(0, 100%, 40%);">- vl_PDUAddressEncoded.paramLength:= lengthof(vl_PDUAddressEncoded.addr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return vl_PDUAddressEncoded;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- } //ConvertASPAddressToEncodedAddress_itu</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> template (value) PDU_SCCP ts_SCCP_UDT(SCCP_PAR_Address called, SCCP_PAR_Address calling,</span><br><span> template (value) octetstring data,</span><br><span> template (value) BIT4 msg_hdl := '0000'B) := {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16962">change 16962</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/+/16962"/><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: I5fe700bd751e1f8f432d052ae6a2f013c5b89580 </div>
<div style="display:none"> Gerrit-Change-Number: 16962 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>