aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2021-01-21 19:51:11 +0000
committerHarald Welte <laforge@osmocom.org>2021-01-21 20:54:18 +0100
commit22b58d7ecc0b0d76de95c7a7aca977737f60136d (patch)
tree16074318148b3e1508c01dadb65d493994bc5c12
parent98365d159f29186792d4bed2d4d58beb9cd61b83 (diff)
osmo-gbproxy: fix configuration
also, only change those values from their default values that are neccessary to change; fall-back on the defaults whenever possible. Change-Id: I5fba21ddf1854ed2b4f829785ab016dfa284456e
-rw-r--r--ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg24
-rw-r--r--ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg4
-rw-r--r--ttcn3-gbproxy-test/GBProxy_Tests.cfg39
-rw-r--r--ttcn3-gbproxy-test/osmo-gbproxy.cfg4
4 files changed, 15 insertions, 56 deletions
diff --git a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
index 8a95e2e..361b32c 100644
--- a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
@@ -20,23 +20,15 @@ GBProxy_Tests.mp_nsconfig_sgsn := {
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 23000,
- remote_ip := "172.18.25.10",
- data_weight := 1,
- signalling_weight := 0
+ remote_ip := "172.18.25.10"
}
}
}, {
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 23000,
- remote_ip := "172.18.25.10",
- data_weight := 0,
- signalling_weight := 1
+ remote_ip := "172.18.25.10"
}
}
}
@@ -47,23 +39,15 @@ GBProxy_Tests.mp_nsconfig_sgsn := {
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 24000,
- remote_ip := "172.18.25.10",
- data_weight := 1,
- signalling_weight := 0
+ remote_ip := "172.18.25.10"
}
}
}, {
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.25.103",
- local_udp_port := 24000,
- remote_ip := "172.18.25.10",
- data_weight := 0,
- signalling_weight := 1
+ remote_ip := "172.18.25.10"
}
}
}
diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
index a4a241d..7d26b3c 100644
--- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
+++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg
@@ -31,9 +31,9 @@ ns
bind udp local
listen 172.18.25.10 23000
nse 101
- ip-sns 172.18.25.103 23000
+ ip-sns 172.18.25.103 7777
nse 102
- ip-sns 172.18.25.103 24000
+ ip-sns 172.18.25.103 8888
bind fr hdlcnet1
fr hdlcnet1 frnet
bind fr hdlcnet2
diff --git a/ttcn3-gbproxy-test/GBProxy_Tests.cfg b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
index 8638586..3ad875c 100644
--- a/ttcn3-gbproxy-test/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test/GBProxy_Tests.cfg
@@ -19,23 +19,15 @@ GBProxy_Tests.mp_nsconfig_sgsn := {
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.24.103",
- local_udp_port := 23000,
- remote_ip := "172.18.24.10",
- data_weight := 1,
- signalling_weight := 0
+ remote_ip := "172.18.24.10"
}
}
}, {
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.24.103",
- local_udp_port := 23000,
- remote_ip := "172.18.24.10",
- data_weight := 0,
- signalling_weight := 1
+ remote_ip := "172.18.24.10"
}
}
}
@@ -46,23 +38,15 @@ GBProxy_Tests.mp_nsconfig_sgsn := {
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.24.103",
- local_udp_port := 24000,
- remote_ip := "172.18.24.10",
- data_weight := 1,
- signalling_weight := 0
+ remote_ip := "172.18.24.10"
}
}
}, {
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.24.103",
- local_udp_port := 24000,
- remote_ip := "172.18.24.10",
- data_weight := 0,
- signalling_weight := 1
+ remote_ip := "172.18.24.10"
}
}
}
@@ -75,11 +59,8 @@ GBProxy_Tests.mp_nsconfig_pcu := {
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.24.103",
- remote_ip := "172.18.24.10",
- data_weight := 1,
- signalling_weight := 1
+ remote_ip := "172.18.24.10"
}
}
}
@@ -89,11 +70,8 @@ GBProxy_Tests.mp_nsconfig_pcu := {
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.24.103",
- remote_ip := "172.18.24.10",
- data_weight := 1,
- signalling_weight := 1
+ remote_ip := "172.18.24.10"
}
}
}
@@ -103,11 +81,8 @@ GBProxy_Tests.mp_nsconfig_pcu := {
{
provider := {
ip := {
- address_family := AF_INET,
local_ip := "172.18.24.103",
- remote_ip := "172.18.24.10",
- data_weight := 1,
- signalling_weight := 1
+ remote_ip := "172.18.24.10"
}
}
}
diff --git a/ttcn3-gbproxy-test/osmo-gbproxy.cfg b/ttcn3-gbproxy-test/osmo-gbproxy.cfg
index 743e6dc..6f49f06 100644
--- a/ttcn3-gbproxy-test/osmo-gbproxy.cfg
+++ b/ttcn3-gbproxy-test/osmo-gbproxy.cfg
@@ -32,9 +32,9 @@ ns
listen 172.18.24.10 23000
accept-ipaccess
nse 101
- ip-sns 172.18.24.103 23000
+ ip-sns 172.18.24.103 7777
nse 102
- ip-sns 172.18.24.103 24000
+ ip-sns 172.18.24.103 8888
timer tns-block 3
timer tns-block-retries 3
timer tns-reset 3