<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20636">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Correctly handle ALIVE/TEST procedure with FR/NS-over-IP without SNS<br><br>If IP-SNS is not used we should wait for the RESET procedure to finish<br>before sending NS-ALIVE.<br>For IP-SNS start NS-ALIVE in both roles (sgsn and bss) and don't handle<br>NS-RESET.<br><br>Also unified the log messages a bit (received -> Rx).<br><br>Related: SYS#5002<br>Change-Id: Ie01fee70297255b3d9c091bc2cec75b0f915c588<br>---<br>M library/NS_Emulation.ttcnpp<br>1 file changed, 40 insertions(+), 23 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 5fb2aa6..4d3db4c 100644</span><br><span>--- a/library/NS_Emulation.ttcnpp</span><br><span>+++ b/library/NS_Emulation.ttcnpp</span><br><span>@@ -217,20 +217,9 @@</span><br><span> f_sendAlive();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- [config.role_sgsn] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP}) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Provider Link came up: sending NS-ALIVE");</span><br><span style="color: hsl(0, 100%, 40%);">- f_sendAlive();</span><br><span style="color: hsl(0, 100%, 40%);">- Tns_test.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%);">- [not config.role_sgsn] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP}) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Provider Link came up: sending NS-RESET");</span><br><span style="color: hsl(0, 100%, 40%);">- f_sendReset();</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Stop t_alive when receiving ALIVE-ACK */</span><br><span> [Tns_alive.running] NSCP.receive(t_NS_ALIVE_ACK) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("NS-ALIVE-ACK received: stopping Tns-alive; starting Tns-test");</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Rx NS-ALIVE-ACK: stopping Tns-alive; starting Tns-test");</span><br><span> Tns_alive.stop;</span><br><span> Tns_test.start;</span><br><span> }</span><br><span>@@ -246,17 +235,7 @@</span><br><span> /* FIXME */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Respond to RESET with correct NSEI/NSVCI */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(tr_NS_RESET(?, 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%);">- NSCP.send(ts_NS_RESET_ACK(config.nsvci, config.nsei));</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%);">- /* Respond to RESET with wrong NSEI/NSVCI */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(tr_NS_RESET(?, ?, ?)) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- log("Rx NS-RESET for unknown NSEI/NSVCI");</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ [not config.handle_sns] as_handle_reset();</span><br><span> </span><br><span> [config.role_sgsn and config.handle_sns and ischosen(config.provider.ip)] as_sns_sgsn();</span><br><span> </span><br><span>@@ -267,10 +246,48 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ private altstep as_handle_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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ [config.role_sgsn] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Provider Link came up: waiting for NS-RESET");</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%);">+ [not config.role_sgsn] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Provider Link came up: sending NS-RESET");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendReset();</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%);">+ /* Respond to RESET with correct NSEI/NSVCI */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(tr_NS_RESET(?, 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%);">+ NSCP.send(ts_NS_RESET_ACK(config.nsvci, config.nsei));</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Rx NS-RESET: Sending NS-ALIVE");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendAlive();</span><br><span style="color: hsl(120, 100%, 40%);">+ Tns_test.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%);">+ /* Respond to RESET with wrong NSEI/NSVCI */</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(tr_NS_RESET(?, ?, ?)) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Rx NS-RESET for unknown NSEI/NSVCI");</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME */</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> /* 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> private altstep as_sns_sgsn() runs on NS_CT {</span><br><span> var PDU_NS rf;</span><br><span style="color: hsl(120, 100%, 40%);">+ [config.role_sgsn] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Provider Link came up: sending NS-ALIVE");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendAlive();</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%);">+ [not config.role_sgsn] NSCP.receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP}) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("Provider Link came up: sending NS-ALIVE");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sendAlive();</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> [] NSCP.receive(tr_SNS_SIZE(config.nsei)) -> value rf {</span><br><span> /* blindly acknowledge whatever the PCU sends */</span><br><span> NSCP.send(ts_SNS_SIZE_ACK(config.nsei, omit));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20636">change 20636</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/+/20636"/><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: Ie01fee70297255b3d9c091bc2cec75b0f915c588 </div>
<div style="display:none"> Gerrit-Change-Number: 20636 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </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: 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>