<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20123">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
lynxis lazus: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Emulation: Refactor if/elseif/... clause to altsteps with guard<br><br>This makes for much more readable code, and we can even do without<br>activating any default altsteps.<br><br>Change-Id: I4c38dd55b7c27899735f5730851d36c1410d96a8<br>---<br>M library/NS_Emulation.ttcnpp<br>1 file changed, 69 insertions(+), 71 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp</span><br><span>index 5872b00..dcc0e17 100644</span><br><span>--- a/library/NS_Emulation.ttcnpp</span><br><span>+++ b/library/NS_Emulation.ttcnpp</span><br><span>@@ -203,7 +203,7 @@</span><br><span> Tns_block.start;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- altstep as_allstate() runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ private altstep as_allstate() runs on NS_CT {</span><br><span> var PDU_NS rf;</span><br><span> var ASP_Event evt;</span><br><span> </span><br><span>@@ -266,7 +266,7 @@</span><br><span> </span><br><span> /* simple IP Sub-Network Service responder for the SGSN side. This is not a full implementation</span><br><span> * of the protocol, merely sufficient to make the PCU/BSS side happy to proceed */</span><br><span style="color: hsl(0, 100%, 40%);">- altstep as_sns_sgsn() runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ private altstep as_sns_sgsn() runs on NS_CT {</span><br><span> var PDU_NS rf;</span><br><span> [] NSCP.receive(tr_SNS_SIZE(config.nsei)) -> value rf {</span><br><span> /* blindly acknowledge whatever the PCU sends */</span><br><span>@@ -305,82 +305,80 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- private function f_ScanEvents() runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ private altstep as_alive_blocked() runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_NS rf;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bogus block, just respond with ACK */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(tr_NS_BLOCK(?, config.nsvci)) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(ts_NS_BLOCK_ACK(config.nsvci));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Respond to UNBLOCK with UNBLOCK-ACK + change state */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_UNBLOCK) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_UNBLOCK_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+ Tns_block.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_change_state(NSE_S_ALIVE_UNBLOCKED);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_UNBLOCK_ACK) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ Tns_block.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_change_state(NSE_S_ALIVE_UNBLOCKED);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] Tns_block.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* repeat unblock transmission */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendUnblock();</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%);">+ private altstep as_alive_unblocked() runs on NS_CT {</span><br><span> var NsUnitdataRequest ud_req;</span><br><span> var PDU_NS rf;</span><br><span style="color: hsl(0, 100%, 40%);">- var default d;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bogus unblock, just respond with ACK */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_UNBLOCK) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_UNBLOCK_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Respond to BLOCK with BLOCK-ACK + change state */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(tr_NS_BLOCK(?, config.nsvci)) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(ts_NS_BLOCK_ACK(config.nsvci));</span><br><span style="color: hsl(120, 100%, 40%);">+ Tns_block.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(tr_NS_BLOCK_ACK(config.nsvci)) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ Tns_block.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NS-UNITDATA PDU from network to NS-UNITDATA.ind to user */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(tr_NS_UNITDATA(?, ?, ?)) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_SP.send(t_NsUdInd(config.nsei,</span><br><span style="color: hsl(120, 100%, 40%);">+ oct2int(rf.pDU_NS_Unitdata.bVCI),</span><br><span style="color: hsl(120, 100%, 40%);">+ rf.pDU_NS_Unitdata.nS_SDU));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NS-UNITDATA.req from user to NS-UNITDATA PDU on network */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NS_SP.receive(t_NsUdReq(config.nsei, ?, ?, omit)) -> value ud_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* using raw octetstring PDU */</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(ts_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, ud_req.sdu));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NS_SP.receive(t_NsUdReq(config.nsei, ?, omit, ?)) -> value ud_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* using decoded BSSGP PDU that we need to encode first */</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring enc := enc_PDU_BSSGP(ud_req.bssgp);</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(ts_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, enc));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- d := activate(as_allstate());</span><br><span style="color: hsl(120, 100%, 40%);">+ private altstep as_wait_reset() runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_NS rf;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(tr_NS_RESET_ACK(config.nsvci, config.nsei)) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendAlive();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendUnblock();</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ private function f_ScanEvents() runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_NS rf;</span><br><span> while (true) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_state == NSE_S_DEAD_BLOCKED) {</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [false] any timer.timeout {}</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (g_state == NSE_S_WAIT_RESET) {</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(tr_NS_RESET_ACK(config.nsvci, config.nsei)) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span style="color: hsl(0, 100%, 40%);">- f_sendAlive();</span><br><span style="color: hsl(0, 100%, 40%);">- f_sendUnblock();</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 if (g_state == NSE_S_ALIVE_BLOCKED) {</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- /* bogus block, just respond with ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(tr_NS_BLOCK(?, config.nsvci)) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(ts_NS_BLOCK_ACK(config.nsvci));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* Respond to UNBLOCK with UNBLOCK-ACK + change state */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_UNBLOCK) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_UNBLOCK_ACK);</span><br><span style="color: hsl(0, 100%, 40%);">- Tns_block.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- f_change_state(NSE_S_ALIVE_UNBLOCKED);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_UNBLOCK_ACK) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- Tns_block.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- f_change_state(NSE_S_ALIVE_UNBLOCKED);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] Tns_block.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- /* repeat unblock transmission */</span><br><span style="color: hsl(0, 100%, 40%);">- f_sendUnblock();</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 if (g_state == NSE_S_ALIVE_UNBLOCKED) {</span><br><span style="color: hsl(0, 100%, 40%);">- alt {</span><br><span style="color: hsl(0, 100%, 40%);">- /* bogus unblock, just respond with ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_UNBLOCK) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_UNBLOCK_ACK);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* Respond to BLOCK with BLOCK-ACK + change state */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(tr_NS_BLOCK(?, config.nsvci)) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(ts_NS_BLOCK_ACK(config.nsvci));</span><br><span style="color: hsl(0, 100%, 40%);">- Tns_block.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(tr_NS_BLOCK_ACK(config.nsvci)) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- Tns_block.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* NS-UNITDATA PDU from network to NS-UNITDATA.ind to user */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(tr_NS_UNITDATA(?, ?, ?)) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NS_SP.send(t_NsUdInd(config.nsei,</span><br><span style="color: hsl(0, 100%, 40%);">- oct2int(rf.pDU_NS_Unitdata.bVCI),</span><br><span style="color: hsl(0, 100%, 40%);">- rf.pDU_NS_Unitdata.nS_SDU));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* NS-UNITDATA.req from user to NS-UNITDATA PDU on network */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NS_SP.receive(t_NsUdReq(config.nsei, ?, ?, omit)) -> value ud_req {</span><br><span style="color: hsl(0, 100%, 40%);">- /* using raw octetstring PDU */</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(ts_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, ud_req.sdu));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NS_SP.receive(t_NsUdReq(config.nsei, ?, omit, ?)) -> value ud_req {</span><br><span style="color: hsl(0, 100%, 40%);">- /* using decoded BSSGP PDU that we need to encode first */</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring enc := enc_PDU_BSSGP(ud_req.bssgp);</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(ts_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, enc));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [g_state == NSE_S_WAIT_RESET] as_wait_reset();</span><br><span style="color: hsl(120, 100%, 40%);">+ [g_state == NSE_S_ALIVE_BLOCKED] as_alive_blocked();</span><br><span style="color: hsl(120, 100%, 40%);">+ [g_state == NSE_S_ALIVE_UNBLOCKED] as_alive_unblocked();</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_allstate();</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- } /* while */</span><br><span style="color: hsl(0, 100%, 40%);">- //deactivate(d);</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20123">change 20123</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/+/20123"/><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: I4c38dd55b7c27899735f5730851d36c1410d96a8 </div>
<div style="display:none"> Gerrit-Change-Number: 20123 </div>
<div style="display:none"> Gerrit-PatchSet: 12 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </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: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>