From 61c55323664491eae22e5fdda3872a7b200b63d9 Mon Sep 17 00:00:00 2001 From: Alexander Couzens Date: Wed, 27 Jan 2021 21:05:43 +0100 Subject: [PATCH] sgsn: change configuration to the new NS2 Change the whole vty configuration for NS to be more flexible and support more setups. Old configurations are invalid. For further information see: https://osmocom.org/projects/libosmocore/wiki/Network_service_(NS) Depends-on: If5bd6b86e130772e6c93d640b0c637985416136d (osmo-sgsn) Change-Id: I37d010bc4ae553c30feb2ebd2be66d23b96bf42a --- sgsn/SGSN_Tests_NS.ttcn | 2 -- sgsn/osmo-sgsn.cfg | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sgsn/SGSN_Tests_NS.ttcn b/sgsn/SGSN_Tests_NS.ttcn index 9ef2dfb2d..dd68b05dc 100644 --- a/sgsn/SGSN_Tests_NS.ttcn +++ b/sgsn/SGSN_Tests_NS.ttcn @@ -23,7 +23,6 @@ type component RAW_Test_CT extends RAW_NS_CT, test_CT { testcase TC_NS_connect_reset() runs on RAW_Test_CT { f_init_vty(); f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0); - f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock enabled"); /* Send a NS-ALIVE */ f_outgoing_ns_reset(); @@ -35,7 +34,6 @@ testcase TC_NS_connect_reset() runs on RAW_Test_CT { testcase TC_NS_connect_alive() runs on RAW_Test_CT { f_init_vty(); f_init_ns_codec(mp_nsconfig[0], guard_secs := 10.0); - f_vty_config(SGSNVTY, "ns", "encapsulation udp use-reset-block-unblock disabled"); /* Send a NS-ALIVE */ NSCP[0].send(t_NS_ALIVE); diff --git a/sgsn/osmo-sgsn.cfg b/sgsn/osmo-sgsn.cfg index 7ac50bccb..c03c9a3f2 100644 --- a/sgsn/osmo-sgsn.cfg +++ b/sgsn/osmo-sgsn.cfg @@ -47,9 +47,9 @@ ns timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation udp local-ip 127.0.0.10 - encapsulation udp local-port 23000 - encapsulation framerelay-gre enabled 0 + bind udp local10 + listen 127.0.0.10 23000 + accept-ipaccess bssgp sgsn gtp local-ip 127.0.0.10