diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2021-01-27 21:02:13 +0100 |
|---|---|---|
| committer | lynxis lazus <lynxis@fe80.eu> | 2021-01-28 21:19:59 +0000 |
| commit | caf73b803c666a63e9948bbf12b4f424cae754bd (patch) | |
| tree | 8e1e65b65d53f693e050808081ed1bc01092d3b6 | |
| parent | 0018d3e0ec0441dad72ca504814afce2f58bd0e8 (diff) | |
sgsn: migrate to the new gprs_ns2_vty configuration
Change the whole vty configuration for NS to be more flexible
and support more setups. Old configurations are invalid.
API change which must be synchronized with libosmocore
For further information see:
https://osmocom.org/projects/libosmocore/wiki/Network_service_(NS)
Depends-on: I8c3f2afecc74b78f7f914f7dce166cbcb63444eb (libosmocore)
Change-Id: Ie9306ab4d4738c2c57a69987086e22771b30657e
| -rw-r--r-- | TODO-RELEASE | 1 | ||||
| -rw-r--r-- | doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg | 6 | ||||
| -rw-r--r-- | doc/examples/osmo-sgsn/osmo-sgsn.cfg | 6 | ||||
| -rw-r--r-- | doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg | 6 | ||||
| -rw-r--r-- | src/sgsn/sgsn_main.c | 13 |
5 files changed, 11 insertions, 21 deletions
diff --git a/TODO-RELEASE b/TODO-RELEASE index 1e409b59c..5514897b4 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,3 +1,4 @@ #component what description / commit summary line manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0 configure.ac libosmocore depend on next released libosmocore after 1.4.x with hashtable support +sgsn vty/config change the configuration of the vty config. old configuration are invalid. diff --git a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg index 85112f41c..7abe7b38e 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg @@ -21,9 +21,9 @@ ns timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation udp local-ip 127.0.0.1 - encapsulation udp local-port 23000 - encapsulation framerelay-gre enabled 0 + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess ! bssgp ! diff --git a/doc/examples/osmo-sgsn/osmo-sgsn.cfg b/doc/examples/osmo-sgsn/osmo-sgsn.cfg index 3be4d4935..11413c1b2 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn.cfg @@ -23,9 +23,9 @@ ns timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation udp local-ip 127.0.0.1 - encapsulation udp local-port 23000 - encapsulation framerelay-gre enabled 0 + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess ! bssgp ! diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg index f60c076c2..fd5a20560 100644 --- a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg +++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg @@ -31,9 +31,9 @@ ns timer tns-test 30 timer tns-alive 3 timer tns-alive-retries 10 - encapsulation udp local-ip 127.0.0.1 - encapsulation udp local-port 23000 - encapsulation framerelay-gre enabled 0 + bind udp local + listen 127.0.0.1 23000 + accept-ipaccess ! bssgp ! diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 19039f694..f6eac607c 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -328,11 +328,6 @@ static bool file_exists(const char *path) int main(int argc, char **argv) { int rc; - struct osmo_sockaddr_str bind_address = { - .af = AF_INET, - .ip = "0.0.0.0", - .port = 23000, - }; #if BUILD_IU struct osmo_sccp_instance *sccp; #endif @@ -402,7 +397,7 @@ int main(int argc, char **argv) sgsn_inst_init(sgsn); - gprs_ns2_vty_init(sgsn_nsi, &bind_address); + gprs_ns2_vty_init(sgsn_nsi); bssgp_vty_init(); gprs_llc_vty_init(); gprs_sndcp_vty_init(); @@ -449,12 +444,6 @@ int main(int argc, char **argv) exit(2); } - rc = gprs_ns2_vty_create(); - if (rc < 0) { - LOGP(DGPRS, LOGL_FATAL, "Cannot bind/listen on NSIP socket\n"); - exit(2); - } - gprs_ns2_dynamic_create_nse(sgsn_nsi, true); if (sgsn->cfg.dynamic_lookup) { |