<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23544">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Emulation: Use endpoint list for SNS-CONFIG payload<br><br>We used to have no distinction between endpoints and NSVCs, meaning<br>that we could not have more than one NSVC per endpoint, which in turn<br>meant it was ok to iterate the list of NSVCs for generating the<br>endpoint lists in the SNS-CONFIG payload.<br><br>With Change-Id I05a50b966b8ce93497372ca403d40fd383dd35f7 we remove that<br>constraint and introduce an actual local IP endpoint list. Let's use<br>that one for SNS-CONFIG.<br><br>Change-Id: Ifa91510430a017fa29592a3d5fa2a3697d29c9da<br>---<br>M library/NS_Emulation.ttcnpp<br>1 file changed, 13 insertions(+), 18 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/44/23544/1</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 85869da..d58dc45 100644</span><br><span>--- a/library/NS_Emulation.ttcnpp</span><br><span>+++ b/library/NS_Emulation.ttcnpp</span><br><span>@@ -504,30 +504,25 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* generate a list of v4 + v6 endpoints based on the NSVConfigurations. This is not strictly</span><br><span style="color: hsl(0, 100%, 40%);">- * accurate, as we should create a list of _endpoints_, while we actually create a list of</span><br><span style="color: hsl(0, 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%);">+ /* generate a list of v4 + v6 endpoints based on the IpEndpointTable */</span><br><span> private function gen_sns_ip_elems(out template (omit) IP4_Elements v4_out,</span><br><span> out template (omit) IP6_Elements v6_out) runs on NS_CT {</span><br><span> var integer i;</span><br><span> var IP4_Elements v4 := {};</span><br><span> var IP6_Elements v6 := {};</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i := 0; i < lengthof(g_config.nsvc); i := i + 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- var NSVCConfiguration nsvc_cfg := g_config.nsvc[i];</span><br><span style="color: hsl(0, 100%, 40%);">- if (not ischosen(nsvc_cfg.provider.ip)) {</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (nsvc_cfg.provider.ip.address_family == AF_INET) {</span><br><span style="color: hsl(0, 100%, 40%);">- v4 := v4 & { valueof(ts_SNS_IPv4(nsvc_cfg.provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc_cfg.provider.ip.local_udp_port,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc_cfg.provider.ip.signalling_weight,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc_cfg.provider.ip.data_weight)) };</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (nsvc_cfg.provider.ip.address_family == AF_INET6) {</span><br><span style="color: hsl(0, 100%, 40%);">- v6 := v6 & { valueof(ts_SNS_IPv6(nsvc_cfg.provider.ip.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc_cfg.provider.ip.local_udp_port,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc_cfg.provider.ip.signalling_weight,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc_cfg.provider.ip.data_weight)) };</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i := 0; i < lengthof(g_ip_endpoints); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var IpEndpointTableEntry ipep := g_ip_endpoints[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ipep.address_family == AF_INET) {</span><br><span style="color: hsl(120, 100%, 40%);">+ v4 := v4 & { valueof(ts_SNS_IPv4(ipep.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ ipep.local_udp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ ipep.signalling_weight,</span><br><span style="color: hsl(120, 100%, 40%);">+ ipep.data_weight)) };</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (ipep.address_family == AF_INET6) {</span><br><span style="color: hsl(120, 100%, 40%);">+ v6 := v6 & { valueof(ts_SNS_IPv6(ipep.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ ipep.local_udp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ ipep.signalling_weight,</span><br><span style="color: hsl(120, 100%, 40%);">+ ipep.data_weight)) };</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/c/osmo-ttcn3-hacks/+/23544">change 23544</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/+/23544"/><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: Ifa91510430a017fa29592a3d5fa2a3697d29c9da </div>
<div style="display:none"> Gerrit-Change-Number: 23544 </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>