<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10376">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Emulation: support multiple instances at the same time<br><br>The NS_Emulation has multiple configuration values hardcoded.<br>Add an offset parameter to NSStart which adds to:<br>- the source udp port<br>- nsei<br>- nsvci.<br><br>Change-Id: I9128f9ad5c372779c38799269393137ba52576cd<br>---<br>M library/NS_Emulation.ttcn<br>1 file changed, 22 insertions(+), 16 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/76/10376/1</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 01d45b4..1095ae5 100644</span><br><span>--- a/library/NS_Emulation.ttcn</span><br><span>+++ b/library/NS_Emulation.ttcn</span><br><span>@@ -72,7 +72,10 @@</span><br><span> out NsUnitdataRequest;</span><br><span> } with { extension "internal" };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- function NSStart() runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ function NSStart(integer init_offset := 0) runs on NS_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ offset := init_offset;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := mp_nsei + offset;</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvci := mp_nsvci + offset;</span><br><span> f_init();</span><br><span> f_ScanEvents();</span><br><span> }</span><br><span>@@ -80,7 +83,7 @@</span><br><span> private function f_init() runs on NS_CT {</span><br><span> var Result res;</span><br><span> /* Connect the UDP socket */</span><br><span style="color: hsl(0, 100%, 40%);">- res := f_IPL4_connect(NSCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port, 0, { udp := {}});</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_IPL4_connect(NSCP, mp_remote_ip, mp_remote_udp_port, mp_local_ip, mp_local_udp_port + offset, 0, { udp := {}});</span><br><span> if (not ispresent(res.connId)) {</span><br><span> setverdict(fail, "Could not connect NS UDP socket, check your configuration");</span><br><span> mtc.stop;</span><br><span>@@ -97,6 +100,9 @@</span><br><span> /* NS-User SAP towards the user */</span><br><span> port NS_SP_PT NS_SP;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ var integer offset := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ var Nsvci nsvci := 0</span><br><span style="color: hsl(120, 100%, 40%);">+ var Nsvci nsei := 0</span><br><span> var NseState g_state := NSE_S_DEAD_BLOCKED;</span><br><span> var ConnectionId g_conn_id := -1;</span><br><span> </span><br><span>@@ -118,11 +124,11 @@</span><br><span> var NseState old_state := g_state;</span><br><span> g_state := new_state;</span><br><span> log("NS State Transition: ", old_state, " -> ", new_state);</span><br><span style="color: hsl(0, 100%, 40%);">- NS_SP.send(t_NsStsInd(mp_nsei, mp_nsvci, old_state, new_state));</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_SP.send(t_NsStsInd(nsei, nsvci, old_state, new_state));</span><br><span> }</span><br><span> </span><br><span> private function f_sendReset() runs on NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET(NS_CAUSE_OM_INTERVENTION, mp_nsvci, mp_nsei)));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET(NS_CAUSE_OM_INTERVENTION, nsvci, nsei)));</span><br><span> g_state := NSE_S_WAIT_RESET;</span><br><span> }</span><br><span> </span><br><span>@@ -137,7 +143,7 @@</span><br><span> }</span><br><span> </span><br><span> private function f_sendBlock(NsCause cause) runs on NS_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK(cause, mp_nsvci)));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK(cause, nsvci)));</span><br><span> Tns_block.start;</span><br><span> }</span><br><span> </span><br><span>@@ -176,9 +182,9 @@</span><br><span> }</span><br><span> </span><br><span> /* Respond to RESET with correct NSEI/NSVCI */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET(?, mp_nsvci, mp_nsei))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET(?, nsvci, nsei))) -> value rf {</span><br><span> f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET_ACK(mp_nsvci, mp_nsei)));</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, t_NS_RESET_ACK(nsvci, nsei)));</span><br><span> }</span><br><span> </span><br><span> /* Respond to RESET with wrong NSEI/NSVCI */</span><br><span>@@ -210,7 +216,7 @@</span><br><span> }</span><br><span> } else if (g_state == NSE_S_WAIT_RESET) {</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET_ACK(mp_nsvci, mp_nsei))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(t_NS_RESET_ACK(nsvci, nsei))) -> value rf {</span><br><span> f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span> f_sendAlive();</span><br><span> f_sendUnblock();</span><br><span>@@ -219,8 +225,8 @@</span><br><span> } else if (g_state == NSE_S_ALIVE_BLOCKED) {</span><br><span> alt {</span><br><span> /* bogus block, just respond with ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, mp_nsvci))) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(mp_nsvci)));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, nsvci))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(nsvci)));</span><br><span> }</span><br><span> /* Respond to UNBLOCK with UNBLOCK-ACK + change state */</span><br><span> [] NSCP.receive(t_NS_RecvFrom(t_NS_UNBLOCK)) -> value rf {</span><br><span>@@ -244,26 +250,26 @@</span><br><span> NSCP.send(t_NS_Send(g_conn_id, t_NS_UNBLOCK_ACK));</span><br><span> }</span><br><span> /* Respond to BLOCK with BLOCK-ACK + change state */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, mp_nsvci))) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(mp_nsvci)));</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK(?, nsvci))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSCP.send(t_NS_Send(g_conn_id, t_NS_BLOCK_ACK(nsvci)));</span><br><span> Tns_block.stop;</span><br><span> f_change_state(NSE_S_ALIVE_BLOCKED);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK_ACK(mp_nsvci))) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NSCP.receive(t_NS_RecvFrom(t_NS_BLOCK_ACK(nsvci))) -> value rf {</span><br><span> Tns_block.stop;</span><br><span> }</span><br><span> /* NS-UNITDATA PDU from network to NS-UNITDATA.ind to user */</span><br><span> [] NSCP.receive(t_NS_RecvFrom(t_NS_UNITDATA(?, ?, ?))) -> value rf {</span><br><span style="color: hsl(0, 100%, 40%);">- NS_SP.send(t_NsUdInd(mp_nsei,</span><br><span style="color: hsl(120, 100%, 40%);">+ NS_SP.send(t_NsUdInd(nsei,</span><br><span> oct2int(rf.msg.pDU_NS_Unitdata.bVCI),</span><br><span> rf.msg.pDU_NS_Unitdata.nS_SDU));</span><br><span> }</span><br><span> /* NS-UNITDATA.req from user to NS-UNITDATA PDU on network */</span><br><span style="color: hsl(0, 100%, 40%);">- [] NS_SP.receive(t_NsUdReq(mp_nsei, ?, ?, omit)) -> value ud_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NS_SP.receive(t_NsUdReq(nsei, ?, ?, omit)) -> value ud_req {</span><br><span> /* using raw octetstring PDU */</span><br><span> NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, ud_req.sdu)));</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- [] NS_SP.receive(t_NsUdReq(mp_nsei, ?, omit, ?)) -> value ud_req {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] NS_SP.receive(t_NsUdReq(nsei, ?, omit, ?)) -> value ud_req {</span><br><span> /* using decoded BSSGP PDU that we need to encode first */</span><br><span> var octetstring enc := enc_PDU_BSSGP(ud_req.bssgp);</span><br><span> NSCP.send(t_NS_Send(g_conn_id, t_NS_UNITDATA(t_SduCtrlB, ud_req.bvci, enc)));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10376">change 10376</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/10376"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9128f9ad5c372779c38799269393137ba52576cd </div>
<div style="display:none"> Gerrit-Change-Number: 10376 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>