<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21307">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: LOCAL HACKS<br><br>Change-Id: I74f5631ce5f5c06b3eb0ad2d23db37365cd37c78<br>---<br>M fr-net/FRNET_Tests.cfg<br>M fr/FR_Tests.cfg<br>M gbproxy/osmo-gbproxy.cfg<br>M library/BSSGP_Emulation.ttcnpp<br>M library/Osmocom_Gb_Types.ttcn<br>5 files changed, 179 insertions(+), 9 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/07/21307/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/fr-net/FRNET_Tests.cfg b/fr-net/FRNET_Tests.cfg</span><br><span>index dedd828..a90914b 100644</span><br><span>--- a/fr-net/FRNET_Tests.cfg</span><br><span>+++ b/fr-net/FRNET_Tests.cfg</span><br><span>@@ -7,6 +7,90 @@</span><br><span> [LOGGING]</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+FRNET_Tests.mp_num_bvc := 50;</span><br><span style="color: hsl(120, 100%, 40%);">+FRNET_Tests.mp_nsconfig := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ role_sgsn := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_sns := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlcnet1",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 16</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%);">+ nsvci := 1</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlcnet2",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 17</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%);">+ nsvci := 2</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlcnet3",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 18</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%);">+ nsvci := 3</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlcnet4",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 19</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%);">+ nsvci := 4</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%);">+ nsei := 2,</span><br><span style="color: hsl(120, 100%, 40%);">+ role_sgsn := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_sns := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlcnet5",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 24</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%);">+ nsvci := 9</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlcnet6",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 25</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%);">+ nsvci := 10</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlcnet7",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 26</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%);">+ nsvci := 11</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlcnet8",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 27</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%);">+ nsvci := 12</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 style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> [TESTPORT_PARAMETERS]</span><br><span> </span><br><span>diff --git a/fr/FR_Tests.cfg b/fr/FR_Tests.cfg</span><br><span>index 9a97c3a..e9d0701 100644</span><br><span>--- a/fr/FR_Tests.cfg</span><br><span>+++ b/fr/FR_Tests.cfg</span><br><span>@@ -7,6 +7,89 @@</span><br><span> [LOGGING]</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span style="color: hsl(120, 100%, 40%);">+FR_Tests.mp_num_bvc := 20;</span><br><span style="color: hsl(120, 100%, 40%);">+FR_Tests.mp_num_ue_in_bvc := 5;</span><br><span style="color: hsl(120, 100%, 40%);">+FR_Tests.mp_nsconfig := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ nsei := 1,</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 style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlc1",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 16</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%);">+ nsvci := 1</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlc2",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 17</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%);">+ nsvci := 2</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlc3",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 18</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%);">+ nsvci := 3</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlc4",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 19</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%);">+ nsvci := 4</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%);">+ nsei := 2,</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 style="color: hsl(120, 100%, 40%);">+ nsvc := {</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlc5",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 24</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%);">+ nsvci := 9</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlc6",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 25</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%);">+ nsvci := 10</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlc7",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 26</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%);">+ nsvci := 11</span><br><span style="color: hsl(120, 100%, 40%);">+ }, {</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ fr := {</span><br><span style="color: hsl(120, 100%, 40%);">+ netdev := "hdlc8",</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := 27</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%);">+ nsvci := 12</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> </span><br><span> [TESTPORT_PARAMETERS]</span><br><span> </span><br><span>diff --git a/gbproxy/osmo-gbproxy.cfg b/gbproxy/osmo-gbproxy.cfg</span><br><span>index 350ddf5..2ee92a5 100644</span><br><span>--- a/gbproxy/osmo-gbproxy.cfg</span><br><span>+++ b/gbproxy/osmo-gbproxy.cfg</span><br><span>@@ -2,17 +2,17 @@</span><br><span> ! Osmocom Gb Proxy (0.9.0.404-6463) configuration saved from vty</span><br><span> !!</span><br><span> !</span><br><span style="color: hsl(120, 100%, 40%);">+log stderr</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lns debug</span><br><span> line vty</span><br><span> no login</span><br><span> !</span><br><span style="color: hsl(0, 100%, 40%);">-gbproxy</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn nsei 101</span><br><span> ns</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 nsvci 101</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 remote-role sgsn</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 encapsulation udp</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 remote-ip 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 remote-port 7777</span><br><span style="color: hsl(120, 100%, 40%);">+ !nse 101 nsvci 101</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101 nsvci 101 remote-role sgsn</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101 nsvci 101 encapsulation udp</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101 nsvci 101 remote-ip 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101 nsvci 101 remote-port 7777</span><br><span> timer tns-block 3</span><br><span> timer tns-block-retries 3</span><br><span> timer tns-reset 3</span><br><span>@@ -23,3 +23,6 @@</span><br><span> encapsulation udp local-ip 127.0.0.1</span><br><span> encapsulation udp local-port 23000</span><br><span> encapsulation framerelay-gre enabled 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+gbproxy</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn nsei 101</span><br><span>diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp</span><br><span>index 898b38d..c45fd75 100644</span><br><span>--- a/library/BSSGP_Emulation.ttcnpp</span><br><span>+++ b/library/BSSGP_Emulation.ttcnpp</span><br><span>@@ -242,7 +242,7 @@</span><br><span> /* port to per-BVC components */</span><br><span> port BSSGP_BVC_SP_PT BVC;</span><br><span> /* per-BVC state table */</span><br><span style="color: hsl(0, 100%, 40%);">- var BvcEntity BvcTable[16];</span><br><span style="color: hsl(120, 100%, 40%);">+ var BvcEntity BvcTable[64];</span><br><span> };</span><br><span> </span><br><span> /* one element in the per-BVC state table */</span><br><span>diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn</span><br><span>index ee03a8a..0be29b1 100644</span><br><span>--- a/library/Osmocom_Gb_Types.ttcn</span><br><span>+++ b/library/Osmocom_Gb_Types.ttcn</span><br><span>@@ -854,7 +854,7 @@</span><br><span> }</span><br><span> </span><br><span> template LLC_PDU ts_BSSGP_LLC_PDU(octetstring pdu) := {</span><br><span style="color: hsl(0, 100%, 40%);">- iEI := '0D'O,</span><br><span style="color: hsl(120, 100%, 40%);">+ iEI := '0E'O,</span><br><span> ext := '1'B,</span><br><span> lengthIndicator := f_bssgp_length_ind(lengthof(pdu)),</span><br><span> lLC_PDU := pdu</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21307">change 21307</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/+/21307"/><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: I74f5631ce5f5c06b3eb0ad2d23db37365cd37c78 </div>
<div style="display:none"> Gerrit-Change-Number: 21307 </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>