<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22303">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
lynxis lazus: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Emulation: Dynamically compute list of v4/v6 endpoints in SNS-CONFIG<br><br>Don't hard-code the assumption that we only have a single IP[v4] endpoint.<br><br>Related: OS#4953<br>Change-Id: I43fe5810b95ebbc9f848856803ac2c71f80d74f3<br>---<br>M library/NS_Emulation.ttcnpp<br>1 file changed, 40 insertions(+), 3 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 d6c7f61..7bede94 100644</span><br><span>--- a/library/NS_Emulation.ttcnpp</span><br><span>+++ b/library/NS_Emulation.ttcnpp</span><br><span>@@ -491,6 +491,42 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* generate a list of v4 + v6 endpoints based on the NSVConfigurations. This is not strictly</span><br><span style="color: hsl(120, 100%, 40%);">+ * accurate, as we should create a list of _endpoints_, while we actually create a list of</span><br><span style="color: hsl(120, 100%, 40%);">+ * NSVCs. Those are only identical as long as our peer only implements one endpoint */</span><br><span style="color: hsl(120, 100%, 40%);">+ private function gen_sns_ip_elems(out template (omit) IP4_Elements v4_out,</span><br><span style="color: hsl(120, 100%, 40%);">+ out template (omit) IP6_Elements v6_out) runs on NSVC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer i;</span><br><span style="color: hsl(120, 100%, 40%);">+ var IP4_Elements v4 := {};</span><br><span style="color: hsl(120, 100%, 40%);">+ var IP6_Elements v6 := {};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < lengthof(g_config.nsvc); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSVCConfiguration nsvc_cfg := g_config.nsvc[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ischosen(nsvc_cfg.provider.ip)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc_cfg.provider.ip.address_family == AF_INET) {</span><br><span style="color: hsl(120, 100%, 40%);">+ v4 := v4 & { valueof(ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc_cfg.provider.ip.local_udp_port)) };</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (nsvc_cfg.provider.ip.address_family == AF_INET6) {</span><br><span style="color: hsl(120, 100%, 40%);">+ v6 := v6 & { valueof(ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc_cfg.provider.ip.local_udp_port)) };</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%);">+ /* we must not return empty lists, but 'omit' as otherwise we get wrong SNS IEs */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lengthof(v4) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ v4_out := omit;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ v4_out := v4;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lengthof(v6) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ v6_out := omit;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ v6_out := v6;</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 NSVC_CT {</span><br><span>@@ -513,9 +549,10 @@</span><br><span> /* blindly acknowledge whatever the PCU sends */</span><br><span> NSCP.send(ts_SNS_CONFIG_ACK(g_config.nsei, omit));</span><br><span> /* send a SNS-CONFIG in response and expect a SNS-CONFIG-ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- var IP4_Elements v4 := { valueof(ts_SNS_IPv4(g_nsvc_config.provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsvc_config.provider.ip.local_udp_port)) };</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(ts_SNS_CONFIG(g_config.nsei, true, v4));</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP4_Elements v4;</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP6_Elements v6;</span><br><span style="color: hsl(120, 100%, 40%);">+ gen_sns_ip_elems(v4, v6);</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(ts_SNS_CONFIG(g_config.nsei, true, v4, v6));</span><br><span> alt {</span><br><span> [] NSCP.receive(tr_SNS_CONFIG_ACK(g_config.nsei, omit)) {</span><br><span> /* success */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22303">change 22303</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/+/22303"/><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: I43fe5810b95ebbc9f848856803ac2c71f80d74f3 </div>
<div style="display:none"> Gerrit-Change-Number: 22303 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: 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>