<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23461">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/PCUIF_Types: use PADDING attribute for 'PCUIF_Message'<br><br>PCUIFv9 compatibility has been dropped in [1], so now we can tell<br>TITAN's RAW codec what kind of padding to expect in received<br>messages and to append to encoded messages. This eliminates<br>thousands of warnings about unhandled tail octets.<br><br>Change-Id: Id5ab587f7984a91f3603efc5d427aa4cb4fa6757<br>Related: [1] Ia9f366ca1fdad700a90ca3367e43523f7bac39a1<br>Related: OS#5083<br>---<br>M library/PCUIF_CodecPort.ttcn<br>M library/PCUIF_Types.ttcn<br>2 files changed, 3 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn</span><br><span>index 0411c39..4b2a8ce 100644</span><br><span>--- a/library/PCUIF_CodecPort.ttcn</span><br><span>+++ b/library/PCUIF_CodecPort.ttcn</span><br><span>@@ -23,7 +23,7 @@</span><br><span> </span><br><span> private function PCUIF_to_UD(in PCUIF_send_data pin, out UD_send_data pout) {</span><br><span> pout.id := pin.id;</span><br><span style="color: hsl(0, 100%, 40%);">- pout.data := enc_pad_PCUIF_Message(pin.data);</span><br><span style="color: hsl(120, 100%, 40%);">+ pout.data := enc_PCUIF_Message(pin.data);</span><br><span> } with { extension "prototype(fast)" };</span><br><span> </span><br><span> private function fix_padding(inout PCUIF_data data) {</span><br><span>diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn</span><br><span>index 2216a0e..b259cfc 100644</span><br><span>--- a/library/PCUIF_Types.ttcn</span><br><span>+++ b/library/PCUIF_Types.ttcn</span><br><span>@@ -18,8 +18,6 @@</span><br><span> modulepar {</span><br><span> /* PCUIF version supported by the IUT */</span><br><span> PCUIF_Version mp_pcuif_version := 10;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Whether to pad outgoing messages */</span><br><span style="color: hsl(0, 100%, 40%);">- boolean mp_pcuif_padding := true;</span><br><span> };</span><br><span> </span><br><span> const charstring PCU_SOCK_DEFAULT := "/tmp/pcu_bts";</span><br><span>@@ -282,6 +280,8 @@</span><br><span> time_ind, msg_type = PCU_IF_MSG_TIME_IND;</span><br><span> pag_req, msg_type = PCU_IF_MSG_PAG_REQ;</span><br><span> app_info_req, msg_type = PCU_IF_MSG_APP_INFO_REQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ /* PCUIFv10: 1006 * 8 = 8048 bits */</span><br><span style="color: hsl(120, 100%, 40%);">+ variant "PADDING(8048)"</span><br><span> };</span><br><span> </span><br><span> external function enc_PCUIF_Message(in PCUIF_Message pdu) return octetstring</span><br><span>@@ -289,26 +289,6 @@</span><br><span> external function dec_PCUIF_Message(in octetstring stream) return PCUIF_Message</span><br><span> with { extension "prototype(convert) decode(RAW)" };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function enc_pad_PCUIF_Message(in PCUIF_Message pdu)</span><br><span style="color: hsl(0, 100%, 40%);">-return octetstring {</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring stream;</span><br><span style="color: hsl(0, 100%, 40%);">- var integer len;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- stream := enc_PCUIF_Message(pdu);</span><br><span style="color: hsl(0, 100%, 40%);">- if (not mp_pcuif_padding) {</span><br><span style="color: hsl(0, 100%, 40%);">- return stream;</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%);">- select (mp_pcuif_version) {</span><br><span style="color: hsl(0, 100%, 40%);">- case (9) { len := 212; }</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: 1006 % 4 > 0 (alignment) */</span><br><span style="color: hsl(0, 100%, 40%);">- case (10) { len := 1006; }</span><br><span style="color: hsl(0, 100%, 40%);">- case else { len := 0; }</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%);">- return f_pad_oct(stream, len, '00'O);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> </span><br><span> /* Generic template for matching messages by type and/or the BTS number */</span><br><span> template PCUIF_Message tr_PCUIF_MSG(template PCUIF_MsgType msg_type := ?,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23461">change 23461</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/+/23461"/><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: Id5ab587f7984a91f3603efc5d427aa4cb4fa6757 </div>
<div style="display:none"> Gerrit-Change-Number: 23461 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: fixeria <vyanitskiy@sysmocom.de> </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>