<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21389">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSSGP_Emulation: reo-rder altsteps of per-NSE component<br><br>the existing ordering of altsteps unfortunately caused some<br>receive clauses never to be hit, as they are only in the default<br>altstep, while more generic receive clauses are already in the<br>state-specific altsteps.<br><br>Let's introduce an as_allstate_pre() and an as_allstate_post() to<br>solve this ordering problem.<br><br>Change-Id: Icc4da95833557931d6685826fb30bdc60bf460c1<br>---<br>M library/BSSGP_Emulation.ttcnpp<br>1 file changed, 67 insertions(+), 26 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/89/21389/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 a6bdbb5..a65dd87 100644</span><br><span>--- a/library/BSSGP_Emulation.ttcnpp</span><br><span>+++ b/library/BSSGP_Emulation.ttcnpp</span><br><span>@@ -397,14 +397,65 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* handling of events irrespective of BVC state */</span><br><span style="color: hsl(0, 100%, 40%);">-altstep as_sig_allstate() runs on BSSGP_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+/* handling of events irrespective of BVC state (before state-specific handling) */</span><br><span style="color: hsl(120, 100%, 40%);">+altstep as_sig_allstate_pre() runs on BSSGP_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var NsUnitdataIndication udi;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Respond to RESET for signalling BVCI 0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSCP.receive(f_BnsUdInd(tr_BVC_RESET(?, 0, omit), 0)) -> value udi {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Rx BVC-RESET for Signaling BVCI=0");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (MGMT.checkstate("Connected")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ MGMT.send(BssgpResetIndication:{0});</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ BSCP.send(f_BnsUdReq(ts_BVC_RESET_ACK(0, omit), 0, 0));</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < sizeof(BvcTable); i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isbound(BvcTable[i].comp_ref) and BvcTable[i].comp_ref != null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ BVC.send(BssgpResetIndication:{0}) to BvcTable[i].comp_ref;</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%);">+ /* any BLOCK or UNBLOCK for the SIGNALING BVCI are illegal */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK(0, ?), 0)) -> value udi {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Rx BVC-BLOCK illegal for BVCI=0: ", udi);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK(0), 0)) -> value udi {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Rx BVC-UNBLOCK illegal for BVCI=0: ", udi);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK_ACK(0), 0)) -> value udi {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Rx BVC-BLOCK-ACK illegal for BVCI=0: ", udi);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK_ACK(0), 0)) -> value udi {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Rx BVC-UNBLOCK-ACK illegal for BVCI=0: ", udi);</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%);">+ /* BVC-RESET-ACK for BVCI=0 while T2 is running: Answer to a BVC-RESET we sent earlier */</span><br><span style="color: hsl(120, 100%, 40%);">+ [g_T2.running] BSCP.receive(f_BnsUdInd(tr_BVC_RESET_ACK(0, omit), 0)) -> value udi {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("BVCI(0) Rx BVC-RESET-ACK");</span><br><span style="color: hsl(120, 100%, 40%);">+ g_T2.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sign_change_state(BVC_S_UNBLOCKED);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < sizeof(BvcTable); i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isbound(BvcTable[i].comp_ref) and BvcTable[i].comp_ref != null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ BVC.send(BssgpResetIndication:{0}) to BvcTable[i].comp_ref;</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%);">+ [] g_T2.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Timeout waiting for BVC-RESET-ACK on BVCI=0");</span><br><span style="color: hsl(120, 100%, 40%);">+ BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(udi.bvci, BSSGP_CAUSE_BVCI_UNKNOWN, udi.bssgp), 0, 0));</span><br><span style="color: hsl(120, 100%, 40%);">+ g_T2.start;</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%);">+/* handling of events irrespective of BVC state (after state-specific handling) */</span><br><span style="color: hsl(120, 100%, 40%);">+altstep as_sig_allstate_post() runs on BSSGP_CT {</span><br><span> var BSSGP_Client_CT vc_conn;</span><br><span> var NsUnitdataIndication udi;</span><br><span> var NsStatusIndication nsi;</span><br><span> var ASP_Event evt;</span><br><span> var BSSGP_BVC_CT bvc_comp_ref;</span><br><span> var BssgpBvci bvci;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BssgpResetRequest brr;</span><br><span> </span><br><span> /* Respond to RESET for signalling BVCI 0 */</span><br><span> [] BSCP.receive(f_BnsUdInd(tr_BVC_RESET(?, 0, omit), 0)) -> value udi {</span><br><span>@@ -447,29 +498,6 @@</span><br><span> BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(ptp_bvci, BSSGP_CAUSE_BVCI_UNKNOWN, udi.bssgp), 0, 0));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* BVC-RESET-ACK for BVCI=0 while T2 is running: Answer to a BVC-RESET we sent earlier */</span><br><span style="color: hsl(0, 100%, 40%);">- [g_T2.running] BSCP.receive(f_BnsUdInd(tr_BVC_RESET_ACK(0, omit), 0)) -> value udi {</span><br><span style="color: hsl(0, 100%, 40%);">- log("BVCI(0) Rx BVC-RESET-ACK");</span><br><span style="color: hsl(0, 100%, 40%);">- g_T2.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- f_sign_change_state(BVC_S_UNBLOCKED);</span><br><span style="color: hsl(0, 100%, 40%);">- for (var integer i := 0; i < sizeof(BvcTable); i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (isbound(BvcTable[i].comp_ref) and BvcTable[i].comp_ref != null) {</span><br><span style="color: hsl(0, 100%, 40%);">- BVC.send(BssgpResetIndication:{0}) to BvcTable[i].comp_ref;</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%);">- [] g_T2.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Timeout waiting for BVC-RESET-ACK on BVCI=0");</span><br><span style="color: hsl(0, 100%, 40%);">- BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(udi.bvci, BSSGP_CAUSE_BVCI_UNKNOWN, udi.bssgp), 0, 0));</span><br><span style="color: hsl(0, 100%, 40%);">- g_T2.start;</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%);">- /* default case of handling unknown PDUs */</span><br><span style="color: hsl(0, 100%, 40%);">- [] BSCP.receive(f_BnsUdInd(?, ?)) -> value udi {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Rx Unexpected BSSGP PDU ", udi.bssgp," in state ", g_sign_bvc_state);</span><br><span style="color: hsl(0, 100%, 40%);">- BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(0, BSSGP_CAUSE_PDU_NOT_COMPATIBLE_WITH_PROTOCOL_STATE, udi.bssgp), 0, 0));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Forwarding of ASP_Event to per-BVC components */</span><br><span> [] BSCP.receive(ASP_Event:?) -> value evt {</span><br><span> for (var integer i := 0; i < sizeof(BvcTable); i := i+1) {</span><br><span>@@ -494,6 +522,17 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* default case of handling unknown PDUs */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] BSCP.receive(f_BnsUdInd(?, ?)) -> value udi {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Rx Unexpected BSSGP PDU ", udi.bssgp," in state ", g_sign_bvc_state);</span><br><span style="color: hsl(120, 100%, 40%);">+ BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(0, BSSGP_CAUSE_PDU_NOT_COMPATIBLE_WITH_PROTOCOL_STATE, udi.bssgp), 0, 0));</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%);">+ [] MGMT.receive(BssgpResetRequest:?) -> value brr {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSCP.send(f_BnsUdReq(ts_BVC_RESET(brr.cause, 0, omit), 0, 0));</span><br><span style="color: hsl(120, 100%, 40%);">+ g_T2.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* send the highest decoded layer of the message through given port */</span><br><span>@@ -552,9 +591,11 @@</span><br><span> while (true) {</span><br><span> alt {</span><br><span> [g_sign_bvc_state == BVC_S_WAIT_RESET] as_sig_wait_reset();</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_sig_allstate_pre();</span><br><span> [g_sign_bvc_state == BVC_S_WAIT_NS_ALIVE_UNBLOCKED] as_sig_wait_ns_alive_unblocked();</span><br><span> [g_sign_bvc_state == BVC_S_UNBLOCKED] as_sig_unblocked();</span><br><span style="color: hsl(0, 100%, 40%);">- [] as_sig_allstate();</span><br><span style="color: hsl(120, 100%, 40%);">+ [g_sign_bvc_state == BVC_S_WAIT_RESET] as_sig_wait_reset();</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_sig_allstate_post();</span><br><span> }</span><br><span> } /* while */</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21389">change 21389</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/+/21389"/><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: Icc4da95833557931d6685826fb30bdc60bf460c1 </div>
<div style="display:none"> Gerrit-Change-Number: 21389 </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>