<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22256">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSGSP_Emulation: Route STATUS to GLOBAL port for both SIG and PTP<br><br>Change-Id: I6573562c0e7638f153798ee178c7c69d07c26756<br>Related: OS#4951<br>---<br>M library/BSSGP_Emulation.ttcnpp<br>M library/Osmocom_Gb_Types.ttcn<br>2 files changed, 17 insertions(+), 5 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/56/22256/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp</span><br><span>index 5c825d6..7996f96 100644</span><br><span>--- a/library/BSSGP_Emulation.ttcnpp</span><br><span>+++ b/library/BSSGP_Emulation.ttcnpp</span><br><span>@@ -1,7 +1,7 @@</span><br><span> module BSSGP_Emulation {</span><br><span> </span><br><span> /* BSSGP Emulation in TTCN-3</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2018-2020 Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018-2021 Harald Welte <laforge@gnumonks.org></span><br><span> * All rights reserved.</span><br><span> *</span><br><span> * Released under the terms of GNU General Public License, Version 2 or</span><br><span>@@ -306,7 +306,7 @@</span><br><span> private template PDU_BSSGP tr_GLOBAL_SIG := (</span><br><span> {pDU_BSSGP_SUSPEND:=?}, {pDU_BSSGP_SUSPEND_ACK:=?}, {pDU_BSSGP_SUSPEND_NACK:=?},</span><br><span> {pDU_BSSGP_RESUME:=?}, {pDU_BSSGP_RESUME_ACK:=?}, {pDU_BSSGP_RESUME_NACK:=?},</span><br><span style="color: hsl(0, 100%, 40%);">- {pDU_BSSGP_SGSN_INVOKE_TRACE:=?}, {pDU_BSSGP_OVERLOAD:=?}</span><br><span style="color: hsl(120, 100%, 40%);">+ {pDU_BSSGP_SGSN_INVOKE_TRACE:=?}, {pDU_BSSGP_OVERLOAD:=?}, {pDU_BSSGP_STATUS:=?}</span><br><span> );</span><br><span> </span><br><span> /* BSSGP messages that should arrive on the RIM port */</span><br><span>@@ -784,6 +784,10 @@</span><br><span> };</span><br><span> type record length(16) of LLC_Entity LLC_Entities;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private template PDU_BSSGP tr_GLOBAL_PTP := (</span><br><span style="color: hsl(120, 100%, 40%);">+ {pDU_BSSGP_STATUS:=?}</span><br><span style="color: hsl(120, 100%, 40%);">+);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_llc_create(boolean sgsn_role := false) return LLC_Entities {</span><br><span> var LLC_Entities llc;</span><br><span> for (var integer i := 0; i < 16; i := i+1) {</span><br><span>@@ -1141,6 +1145,14 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ [] BVC.receive(tr_ptp_BnsUdInd(tr_GLOBAL_PTP, g_cfg.bvci)) -> value udi {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (GLOBAL.checkstate("Connected")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ GLOBAL.send(udi.bssgp);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Received BSSGP STATUS ", udi.bssgp);</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> /* Any other PTP BSSGP message: If it has TLLI, route to component; otherwise broadcast */</span><br><span> [] BVC.receive(tr_ptp_BnsUdInd(?, g_cfg.bvci)) -> value udi {</span><br><span> var BssgpDecoded dec := f_dec_bssgp(udi.bssgp);</span><br><span>diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn</span><br><span>index 589108f..f97b9b0 100644</span><br><span>--- a/library/Osmocom_Gb_Types.ttcn</span><br><span>+++ b/library/Osmocom_Gb_Types.ttcn</span><br><span>@@ -1427,7 +1427,7 @@</span><br><span> }</span><br><span> </span><br><span> /* 10.4.14 */</span><br><span style="color: hsl(0, 100%, 40%);">- template PDU_BSSGP ts_BSSGP_STATUS(template BssgpBvci bvci, template BssgpCause cause,</span><br><span style="color: hsl(120, 100%, 40%);">+ template PDU_BSSGP ts_BSSGP_STATUS(template (omit) BssgpBvci bvci, template BssgpCause cause,</span><br><span> PDU_BSSGP pdu) := {</span><br><span> pDU_BSSGP_STATUS := {</span><br><span> bssgpPduType := '41'O,</span><br><span>@@ -1443,12 +1443,12 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- template PDU_BSSGP tr_BSSGP_STATUS(template BVCI bvci := ?, template BssgpCause cause := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template PDU_BSSGP tr_BSSGP_STATUS(template BssgpBvci bvci := ?, template BssgpCause cause := ?,</span><br><span> template octetstring pdu := ?) := {</span><br><span> pDU_BSSGP_STATUS := {</span><br><span> bssgpPduType := '41'O,</span><br><span> cause := t_BSSGP_CAUSE(cause),</span><br><span style="color: hsl(0, 100%, 40%);">- bVCI := bvci,</span><br><span style="color: hsl(120, 100%, 40%);">+ bVCI := t_BSSGP_BVCI(bvci),</span><br><span> pDU_in_Error := {</span><br><span> iEI := '15'O,</span><br><span> ext := '1'B,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22256">change 22256</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/+/22256"/><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: I6573562c0e7638f153798ee178c7c69d07c26756 </div>
<div style="display:none"> Gerrit-Change-Number: 22256 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>