<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/22365">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-gbproxy: fix configuration<br><br>also, only change those values from their default values that are<br>neccessary to change; fall-back on the defaults whenever possible.<br><br>Change-Id: I5fba21ddf1854ed2b4f829785ab016dfa284456e<br>---<br>M ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg<br>M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg<br>M ttcn3-gbproxy-test/GBProxy_Tests.cfg<br>M ttcn3-gbproxy-test/osmo-gbproxy.cfg<br>4 files changed, 15 insertions(+), 56 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg</span><br><span>index 8a95e2e..361b32c 100644</span><br><span>--- a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg</span><br><span>+++ b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg</span><br><span>@@ -20,23 +20,15 @@</span><br><span> {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.25.103",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.25.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 0</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.25.10"</span><br><span> }</span><br><span> }</span><br><span> }, {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.25.103",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.25.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.25.10"</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -47,23 +39,15 @@</span><br><span> {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.25.103",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 24000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.25.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 0</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.25.10"</span><br><span> }</span><br><span> }</span><br><span> }, {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.25.103",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 24000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.25.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.25.10"</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg</span><br><span>index a4a241d..7d26b3c 100644</span><br><span>--- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg</span><br><span>+++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg</span><br><span>@@ -31,9 +31,9 @@</span><br><span> bind udp local</span><br><span> listen 172.18.25.10 23000</span><br><span> nse 101</span><br><span style="color: hsl(0, 100%, 40%);">- ip-sns 172.18.25.103 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ ip-sns 172.18.25.103 7777</span><br><span> nse 102</span><br><span style="color: hsl(0, 100%, 40%);">- ip-sns 172.18.25.103 24000</span><br><span style="color: hsl(120, 100%, 40%);">+ ip-sns 172.18.25.103 8888</span><br><span> bind fr hdlcnet1</span><br><span> fr hdlcnet1 frnet</span><br><span> bind fr hdlcnet2</span><br><span>diff --git a/ttcn3-gbproxy-test/GBProxy_Tests.cfg b/ttcn3-gbproxy-test/GBProxy_Tests.cfg</span><br><span>index 8638586..3ad875c 100644</span><br><span>--- a/ttcn3-gbproxy-test/GBProxy_Tests.cfg</span><br><span>+++ b/ttcn3-gbproxy-test/GBProxy_Tests.cfg</span><br><span>@@ -19,23 +19,15 @@</span><br><span> {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 0</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span> }</span><br><span> }</span><br><span> }, {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -46,23 +38,15 @@</span><br><span> {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 24000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 0</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span> }</span><br><span> }</span><br><span> }, {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 24000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -75,11 +59,8 @@</span><br><span> {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -89,11 +70,8 @@</span><br><span> {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -103,11 +81,8 @@</span><br><span> {</span><br><span> provider := {</span><br><span> ip := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span> local_ip := "172.18.24.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "172.18.24.10",</span><br><span style="color: hsl(0, 100%, 40%);">- data_weight := 1,</span><br><span style="color: hsl(0, 100%, 40%);">- signalling_weight := 1</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "172.18.24.10"</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>diff --git a/ttcn3-gbproxy-test/osmo-gbproxy.cfg b/ttcn3-gbproxy-test/osmo-gbproxy.cfg</span><br><span>index 743e6dc..6f49f06 100644</span><br><span>--- a/ttcn3-gbproxy-test/osmo-gbproxy.cfg</span><br><span>+++ b/ttcn3-gbproxy-test/osmo-gbproxy.cfg</span><br><span>@@ -32,9 +32,9 @@</span><br><span> listen 172.18.24.10 23000</span><br><span> accept-ipaccess</span><br><span> nse 101</span><br><span style="color: hsl(0, 100%, 40%);">- ip-sns 172.18.24.103 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ ip-sns 172.18.24.103 7777</span><br><span> nse 102</span><br><span style="color: hsl(0, 100%, 40%);">- ip-sns 172.18.24.103 24000</span><br><span style="color: hsl(120, 100%, 40%);">+ ip-sns 172.18.24.103 8888</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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/22365">change 22365</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/docker-playground/+/22365"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5fba21ddf1854ed2b4f829785ab016dfa284456e </div>
<div style="display:none"> Gerrit-Change-Number: 22365 </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-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>