<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13046">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Emulation: Add minimal support for SGSN-side SNS handling<br><br>Change-Id: I1edf739d6fd39478f662a28a7d9334ca51c270a3<br>---<br>M library/NS_Emulation.ttcn<br>M pcu/PCU_Tests.ttcn<br>M sgsn/SGSN_Tests.ttcn<br>3 files changed, 57 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn</span><br><span>index 6915993..9ad89cb 100644</span><br><span>--- a/library/NS_Emulation.ttcn</span><br><span>+++ b/library/NS_Emulation.ttcn</span><br><span>@@ -116,7 +116,9 @@</span><br><span> PortNumber remote_udp_port,</span><br><span> charstring remote_ip,</span><br><span> Nsvci nsvci,</span><br><span style="color: hsl(0, 100%, 40%);">- Nsvci nsei</span><br><span style="color: hsl(120, 100%, 40%);">+ Nsvci nsei,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean role_sgsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean handle_sns</span><br><span> }</span><br><span> </span><br><span> private function f_change_state(NseState new_state) runs on NS_CT {</span><br><span>@@ -192,6 +194,8 @@</span><br><span> /* FIXME */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ [config.role_sgsn and config.handle_sns] as_sns_sgsn();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* default case of handling unknown PDUs */</span><br><span> [] NSCP.receive(t_NS_RecvFrom(?)) -> value rf {</span><br><span> log("Rx Unexpected NS PDU ", rf.msg," in state ", g_state);</span><br><span>@@ -201,6 +205,46 @@</span><br><span> [] NSCP.receive(ASP_Event:?) -> value evt { NS_SP.send(evt); }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* simple IP Sub-Network Service responder for the SGSN side. This is not a full implementation</span><br><span style="color: hsl(120, 100%, 40%);">+ * of the protocol, merely sufficient to make the PCU/BSS side happy to proceed */</span><br><span style="color: hsl(120, 100%, 40%);">+ altstep as_sns_sgsn() runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var NS_RecvFrom rf;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(tr_SNS_SIZE(config.nsei))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* blindly acknowledge whatever the PCU sends */</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, ts_SNS_SIZE_ACK(config.nsei, omit)));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(tr_SNS_SIZE(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "SNS-SIZE from unexpected NSEI");</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG(config.nsei, true,</span><br><span style="color: hsl(120, 100%, 40%);">+ {tr_SNS_IPv4(config.remote_ip, config.remote_udp_port)}))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* blindly acknowledge whatever the PCU sends */</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, ts_SNS_CONFIG_ACK(config.nsei, omit)));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* send a SNS-CONFIG in response and expect a SNS-CONFIG-ACK */</span><br><span style="color: hsl(120, 100%, 40%);">+ var IP4_Elements v4 := { valueof(ts_SNS_IPv4(config.local_ip, config.local_udp_port)) };</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, ts_SNS_CONFIG(config.nsei, true, v4)));</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG_ACK(config.nsei, omit))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* success */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG_ACK(config.nsei, ?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Unexpected SNS-CONFIG-NACK");</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop;</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%);">+ [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG(config.nsei, false, ?))) { /* ignore */}</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG(config.nsei, true, ?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Unexpected SNS-CONFIG content");</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(tr_SNS_CONFIG(?, ?, ?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "SNS-CONFIG from unexpected NSEI");</span><br><span style="color: hsl(120, 100%, 40%);">+ self.stop;</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> private function f_ScanEvents() runs on NS_CT {</span><br><span> var NsUnitdataRequest ud_req;</span><br><span> var NS_RecvFrom rf;</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 6e8185d..f63c4ad 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -43,7 +43,9 @@</span><br><span> remote_udp_port := 21000,</span><br><span> remote_ip := "127.0.0.1",</span><br><span> nsvci := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- nsei := 2342</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 2342,</span><br><span style="color: hsl(120, 100%, 40%);">+ role_sgsn := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_sns := true</span><br><span> };</span><br><span> }</span><br><span> </span><br><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index a2e93c0..8b639e6 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -51,7 +51,9 @@</span><br><span> remote_udp_port := 23000,</span><br><span> remote_ip := "127.0.0.1",</span><br><span> nsvci := 97,</span><br><span style="color: hsl(0, 100%, 40%);">- nsei := 96</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 96,</span><br><span style="color: hsl(120, 100%, 40%);">+ role_sgsn := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_sns := false</span><br><span> },</span><br><span> {</span><br><span> local_udp_port := 21011,</span><br><span>@@ -59,7 +61,9 @@</span><br><span> remote_udp_port := 23000,</span><br><span> remote_ip := "127.0.0.1",</span><br><span> nsvci := 98,</span><br><span style="color: hsl(0, 100%, 40%);">- nsei := 97</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 97,</span><br><span style="color: hsl(120, 100%, 40%);">+ role_sgsn := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_sns := false</span><br><span> },</span><br><span> {</span><br><span> local_udp_port := 21012,</span><br><span>@@ -67,7 +71,9 @@</span><br><span> remote_udp_port := 23000,</span><br><span> remote_ip := "127.0.0.1",</span><br><span> nsvci := 99,</span><br><span style="color: hsl(0, 100%, 40%);">- nsei := 98</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 98,</span><br><span style="color: hsl(120, 100%, 40%);">+ role_sgsn := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_sns := false</span><br><span> }</span><br><span> };</span><br><span> };</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13046">change 13046</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/13046"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1edf739d6fd39478f662a28a7d9334ca51c270a3 </div>
<div style="display:none"> Gerrit-Change-Number: 13046 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>