<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24401">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RAW_NS/NS_Provider_IPL4: allow to use the new NSVC interface<br><br>RAW_NS used previous a single TTCN3 port for a single UDP port<br>(source/listen side).<br>This has the limitation that only a single NSVC could be tested for a<br>local UDP port. However SNS tests require multiple NSVCs over a single UDP port.<br>NS_Provider_IPL4 already supports multiple NSVCs for the NS_Emulation.<br>Extend the support in NS_Provider_IPL4 to also allow RAW_NS to use<br>multiple NSVCs.<br><br>Change-Id: Iafd9310e04066958914201da0cbdcd563bd5c976<br>---<br>M library/NS_Provider_IPL4.ttcn<br>M library/RAW_NS.ttcnpp<br>2 files changed, 92 insertions(+), 19 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/01/24401/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/NS_Provider_IPL4.ttcn b/library/NS_Provider_IPL4.ttcn</span><br><span>index 774c08a..31ad351 100644</span><br><span>--- a/library/NS_Provider_IPL4.ttcn</span><br><span>+++ b/library/NS_Provider_IPL4.ttcn</span><br><span>@@ -28,6 +28,7 @@</span><br><span> import from Misc_Helpers all;</span><br><span> import from NS_Emulation all;</span><br><span> import from NS_Types all;</span><br><span style="color: hsl(120, 100%, 40%);">+import from RAW_NS all;</span><br><span> </span><br><span> import from IPL4asp_Types all;</span><br><span> import from IPL4asp_PortType all;</span><br><span>@@ -51,10 +52,12 @@</span><br><span> type record PerNsvcState {</span><br><span> charstring remote_ip,</span><br><span> PortNumber remote_port,</span><br><span style="color: hsl(0, 100%, 40%);">- NSVC_CT vc_nsvc</span><br><span style="color: hsl(120, 100%, 40%);">+ NSVC_CT vc_nsvc,</span><br><span style="color: hsl(120, 100%, 40%);">+ RAW_NS_CT vc_raw,</span><br><span style="color: hsl(120, 100%, 40%);">+ integer vc_raw_idx</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-signature NSPIP_add_nsvc(charstring remote_ip, PortNumber remote_port, NSVC_CT vc_nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+signature NSPIP_add_nsvc(charstring remote_ip, PortNumber remote_port, NSVC_CT vc_nsvc, RAW_NS_CT vc_raw, integer vc_raw_idx);</span><br><span> signature NSPIP_del_nsvc(charstring remote_ip, PortNumber remote_port);</span><br><span> </span><br><span> type port NSPIP_PROC_PT procedure {</span><br><span>@@ -65,9 +68,13 @@</span><br><span> private function f_nsvc_add(PerNsvcState nsvc) runs on NS_Provider_IPL4_CT</span><br><span> {</span><br><span> for (var integer i := 0; i < sizeof(g_nsvc); i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_nsvc[i].vc_nsvc == null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_nsvc[i].vc_nsvc == null and g_nsvc[i].vc_raw == null) {</span><br><span> g_nsvc[i] := nsvc;</span><br><span style="color: hsl(0, 100%, 40%);">- connect(self:NSVC[i], nsvc.vc_nsvc:NSCP);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_nsvc[i].vc_nsvc != null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(self:NSVC[i], nsvc.vc_nsvc:NSCP);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(self:NSVC[i], nsvc.vc_raw:NSCP[nsvc.vc_raw_idx]);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> NSVC[i].send(NS_Provider_Evt:{link_status := NS_PROV_LINK_STATUS_UP});</span><br><span> return;</span><br><span> }</span><br><span>@@ -78,16 +85,22 @@</span><br><span> private function f_nsvc_del(PerNsvcState nsvc) runs on NS_Provider_IPL4_CT</span><br><span> {</span><br><span> for (var integer i := 0; i < sizeof(g_nsvc); i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_nsvc[i].vc_nsvc != null and</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((g_nsvc[i].vc_nsvc != null or g_nsvc[i].vc_raw != null) and</span><br><span> g_nsvc[i].remote_ip == nsvc.remote_ip and</span><br><span> g_nsvc[i].remote_port == nsvc.remote_port) {</span><br><span> g_nsvc[i] := {</span><br><span> remote_ip := -,</span><br><span> remote_port := -,</span><br><span style="color: hsl(0, 100%, 40%);">- vc_nsvc := null</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_nsvc := null,</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_raw := null,</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_raw_idx := -1</span><br><span> }</span><br><span> NSVC[i].send(NS_Provider_Evt:{link_status := NS_PROV_LINK_STATUS_DOWN});</span><br><span style="color: hsl(0, 100%, 40%);">- disconnect(self:NSVC[i], nsvc.vc_nsvc:NSCP);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc.vc_nsvc != null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ disconnect(self:NSVC[i], nsvc.vc_nsvc:NSCP);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ disconnect(self:NSVC[i], nsvc.vc_raw:NSCP[nsvc.vc_raw_idx]);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return;</span><br><span> }</span><br><span> }</span><br><span>@@ -98,7 +111,7 @@</span><br><span> runs on NS_Provider_IPL4_CT return integer</span><br><span> {</span><br><span> for (var integer i := 0; i < sizeof(g_nsvc); i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_nsvc[i].vc_nsvc != null and</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((g_nsvc[i].vc_nsvc != null or g_nsvc[i].vc_raw != null) and</span><br><span> g_nsvc[i].remote_ip == remote_ip and g_nsvc[i].remote_port == remote_port) {</span><br><span> return i;</span><br><span> }</span><br><span>@@ -109,6 +122,7 @@</span><br><span> function main(NSVCConfiguration config, NSConfiguration nsconfig, charstring id) runs on NS_Provider_IPL4_CT {</span><br><span> for (var integer i := 0; i < sizeof(g_nsvc); i := i+1) {</span><br><span> g_nsvc[i].vc_nsvc := null;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsvc[i].vc_raw := null;</span><br><span> }</span><br><span> </span><br><span> /* in order to support any number of NSVC on this endpoiint, we only bind the socket</span><br><span>@@ -134,6 +148,8 @@</span><br><span> var charstring remote_ip;</span><br><span> var PortNumber remote_port;</span><br><span> var NSVC_CT vc_nsvc;</span><br><span style="color: hsl(120, 100%, 40%);">+ var RAW_NS_CT vc_raw;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer vc_raw_idx;</span><br><span> var NS_CT vc_caller;</span><br><span> alt {</span><br><span> </span><br><span>@@ -181,9 +197,9 @@</span><br><span> }</span><br><span> </span><br><span> /* procedure port to add/remove NSVCs from this provider */</span><br><span style="color: hsl(0, 100%, 40%);">- [] PROC.getcall(NSPIP_add_nsvc:{?,?,?}) -> param (remote_ip, remote_port, vc_nsvc) sender vc_caller {</span><br><span style="color: hsl(0, 100%, 40%);">- f_nsvc_add(PerNsvcState:{remote_ip, remote_port, vc_nsvc});</span><br><span style="color: hsl(0, 100%, 40%);">- PROC.reply(NSPIP_add_nsvc:{remote_ip, remote_port, vc_nsvc}) to vc_caller;</span><br><span style="color: hsl(120, 100%, 40%);">+ [] PROC.getcall(NSPIP_add_nsvc:{?,?,?,?,?}) -> param (remote_ip, remote_port, vc_nsvc, vc_raw, vc_raw_idx) sender vc_caller {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_nsvc_add(PerNsvcState:{remote_ip, remote_port, vc_nsvc, vc_raw, vc_raw_idx});</span><br><span style="color: hsl(120, 100%, 40%);">+ PROC.reply(NSPIP_add_nsvc:{remote_ip, remote_port, vc_nsvc, vc_raw, vc_raw_idx}) to vc_caller;</span><br><span> }</span><br><span> [] PROC.getcall(NSPIP_del_nsvc:{?,?}) -> param (remote_ip, remote_port) sender vc_caller {</span><br><span> f_nsvc_del(PerNsvcState:{remote_ip, remote_port});</span><br><span>@@ -197,9 +213,17 @@</span><br><span> </span><br><span> function f_nspip_add_nsvc(NS_Provider_IPL4_CT vc_ipep, charstring remote_ip, PortNumber remote_port, NSVC_CT vc_nsvc)</span><br><span> runs on NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- NSPIP_PROC.call(NSPIP_add_nsvc:{remote_ip, remote_port, vc_nsvc}) to vc_ipep {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSPIP_PROC.getreply(NSPIP_add_nsvc:{?,?,?});</span><br><span style="color: hsl(120, 100%, 40%);">+ NSPIP_PROC.call(NSPIP_add_nsvc:{remote_ip, remote_port, vc_nsvc, null, -1}) to vc_ipep {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSPIP_PROC.getreply(NSPIP_add_nsvc:{?,?,?,?,?});</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_rawip_add_nsvc(NS_Provider_IPL4_CT vc_ipep, charstring remote_ip, PortNumber remote_port, integer idx)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSPIP_PROC.call(NSPIP_add_nsvc:{remote_ip, remote_port, null, self, idx}) to vc_ipep {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSPIP_PROC.getreply(NSPIP_add_nsvc:{?,?,?,?,?});</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%);">+</span><br><span> } /* module */</span><br><span>diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp</span><br><span>index 8f986e4..b459eb3 100644</span><br><span>--- a/library/RAW_NS.ttcnpp</span><br><span>+++ b/library/RAW_NS.ttcnpp</span><br><span>@@ -25,16 +25,24 @@</span><br><span> import from NS_Provider_FR all;</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type record PerIPProvider {</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_Provider_IPL4_CT vc_NSP_IP,</span><br><span style="color: hsl(120, 100%, 40%);">+ charstring local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ PortNumber local_udp_port</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> public type component RAW_NS_CT {</span><br><span> /* UDP port towards the bottom (IUT) */</span><br><span> port NS_PROVIDER_PT NSCP[4];</span><br><span style="color: hsl(0, 100%, 40%);">- var NS_Provider_IPL4_CT vc_NSP_IP[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ var PerIPProvider ip_prov[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ port NSPIP_PROC_PT NSPIP_PROC;</span><br><span> #ifdef NS_EMULATION_FR</span><br><span> var NS_Provider_FR_CT vc_NSP_FR[4];</span><br><span> #endif</span><br><span> var NSConfiguration g_nsconfig;</span><br><span> timer g_T_guard;</span><br><span> var boolean g_handle_rx_alive := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ var boolean g_initialized := false;</span><br><span> }</span><br><span> </span><br><span> public altstep as_Tguard() runs on RAW_NS_CT {</span><br><span>@@ -44,6 +52,21 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_find_ip_provider(NSVCConfigurationIP nsip_config)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on RAW_NS_CT return integer {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer idx := 0; idx < sizeof(ip_prov); idx := idx+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ip_prov[idx].vc_NSP_IP == null) {</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ip_prov[idx].local_ip == nsip_config.local_ip and</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_prov[idx].local_udp_port == nsip_config.local_udp_port) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return idx;</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%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_init_ns_codec(NSConfiguration ns_config, integer idx := 0, float guard_secs := 60.0, charstring id := testcasename()) runs on RAW_NS_CT {</span><br><span> var Result res;</span><br><span> </span><br><span>@@ -52,15 +75,39 @@</span><br><span> activate(as_Tguard());</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (not g_initialized) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < sizeof(ip_prov); i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_prov[i].vc_NSP_IP := null;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ g_initialized := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (not isbound(g_nsconfig)) {</span><br><span> g_nsconfig := ns_config;</span><br><span> }</span><br><span> </span><br><span> if (ischosen(ns_config.nsvc[idx].provider.ip)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer prov_idx := f_find_ip_provider(ns_config.nsvc[idx].provider.ip);</span><br><span> /* Connect the UDP socket */</span><br><span style="color: hsl(0, 100%, 40%);">- vc_NSP_IP[idx] := NS_Provider_IPL4_CT.create(id & "-provIP");</span><br><span style="color: hsl(0, 100%, 40%);">- connect(self:NSCP[idx], vc_NSP_IP[idx]:NSE);</span><br><span style="color: hsl(0, 100%, 40%);">- vc_NSP_IP[idx].start(NS_Provider_IPL4.main(ns_config.nsvc[idx], ns_config, id));</span><br><span style="color: hsl(120, 100%, 40%);">+ // check if NS_Provider_IPL4_CT is already created</span><br><span style="color: hsl(120, 100%, 40%);">+ // add list of vc_NSP_IP with entries of source ip/port</span><br><span style="color: hsl(120, 100%, 40%);">+ // add a NSVC to it</span><br><span style="color: hsl(120, 100%, 40%);">+ if (prov_idx == -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (prov_idx := 0; prov_idx < sizeof(ip_prov); prov_idx := prov_idx+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ip_prov[prov_idx].vc_NSP_IP == null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+ if (prov_idx > sizeof(ip_prov)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: error !! */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_prov[prov_idx].local_ip := ns_config.nsvc[idx].provider.ip.local_ip;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_prov[prov_idx].local_udp_port := ns_config.nsvc[idx].provider.ip.local_udp_port;</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_prov[prov_idx].vc_NSP_IP := NS_Provider_IPL4_CT.create(id & "-provIP" & int2str(prov_idx));</span><br><span style="color: hsl(120, 100%, 40%);">+ connect(self:NSPIP_PROC, ip_prov[prov_idx].vc_NSP_IP:PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_prov[prov_idx].vc_NSP_IP.start(NS_Provider_IPL4.main(ns_config.nsvc[idx], ns_config, id));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rawip_add_nsvc(ip_prov[prov_idx].vc_NSP_IP, ns_config.nsvc[idx].provider.ip.remote_ip, ns_config.nsvc[idx].provider.ip.remote_udp_port, idx);</span><br><span> #ifdef NS_EMULATION_FR</span><br><span> } else if (ischosen(ns_config.nsvc[idx].provider.fr)) {</span><br><span> vc_NSP_FR[idx] := NS_Provider_FR_CT.create(id & "-provFR");</span><br><span>@@ -75,8 +122,10 @@</span><br><span> }</span><br><span> </span><br><span> function f_clean_ns_codec() runs on RAW_NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- for (var integer i := 0; i < lengthof(vc_NSP_IP); i := i + 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- vc_NSP_IP[i].stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < lengthof(ip_prov); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ip_prov[i].vc_NSP_IP != null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip_prov[i].vc_NSP_IP.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> #ifdef NS_EMULATION_FR</span><br><span> for (var integer i := 0; i < lengthof(vc_NSP_FR); i := i + 1) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24401">change 24401</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/+/24401"/><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: Iafd9310e04066958914201da0cbdcd563bd5c976 </div>
<div style="display:none"> Gerrit-Change-Number: 24401 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>