<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/22501">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: migrate to the new gprs_ns2_vty configuration<br><br>Change the whole vty configuration for NS to be more flexible<br>and support more setups. Old configuration are invalid.<br><br>API change which must be synchronized with libosmocore<br><br>Depends-on: I8c3f2afecc74b78f7f914f7dce166cbcb63444eb (libosmocore)<br>Change-Id: Ie9306ab4d4738c2c57a69987086e22771b30657e<br>---<br>M TODO-RELEASE<br>M doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg<br>M doc/examples/osmo-sgsn/osmo-sgsn.cfg<br>M doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg<br>M src/sgsn/sgsn_main.c<br>5 files changed, 11 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/01/22501/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index 1e409b5..5514897 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -1,3 +1,4 @@</span><br><span> #component what description / commit summary line</span><br><span> manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0</span><br><span> configure.ac libosmocore depend on next released libosmocore after 1.4.x with hashtable support</span><br><span style="color: hsl(120, 100%, 40%);">+sgsn vty/config change the configuration of the vty config. old configuration are invalid.</span><br><span>diff --git a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg</span><br><span>index 85112f4..7abe7b3 100644</span><br><span>--- a/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg</span><br><span>+++ b/doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg</span><br><span>@@ -21,9 +21,9 @@</span><br><span> timer tns-test 30</span><br><span> timer tns-alive 3</span><br><span> timer tns-alive-retries 10</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-ip 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-port 23000</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation framerelay-gre enabled 0</span><br><span style="color: hsl(120, 100%, 40%);">+ bind udp local</span><br><span style="color: hsl(120, 100%, 40%);">+ listen 127.0.0.1 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-ipaccess</span><br><span> !</span><br><span> bssgp</span><br><span> !</span><br><span>diff --git a/doc/examples/osmo-sgsn/osmo-sgsn.cfg b/doc/examples/osmo-sgsn/osmo-sgsn.cfg</span><br><span>index 3be4d49..11413c1 100644</span><br><span>--- a/doc/examples/osmo-sgsn/osmo-sgsn.cfg</span><br><span>+++ b/doc/examples/osmo-sgsn/osmo-sgsn.cfg</span><br><span>@@ -23,9 +23,9 @@</span><br><span> timer tns-test 30</span><br><span> timer tns-alive 3</span><br><span> timer tns-alive-retries 10</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-ip 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-port 23000</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation framerelay-gre enabled 0</span><br><span style="color: hsl(120, 100%, 40%);">+ bind udp local</span><br><span style="color: hsl(120, 100%, 40%);">+ listen 127.0.0.1 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-ipaccess</span><br><span> !</span><br><span> bssgp</span><br><span> !</span><br><span>diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg</span><br><span>index f60c076..fd5a205 100644</span><br><span>--- a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg</span><br><span>+++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg</span><br><span>@@ -31,9 +31,9 @@</span><br><span> timer tns-test 30</span><br><span> timer tns-alive 3</span><br><span> timer tns-alive-retries 10</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-ip 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-port 23000</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation framerelay-gre enabled 0</span><br><span style="color: hsl(120, 100%, 40%);">+ bind udp local</span><br><span style="color: hsl(120, 100%, 40%);">+ listen 127.0.0.1 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-ipaccess</span><br><span> !</span><br><span> bssgp</span><br><span> !</span><br><span>diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c</span><br><span>index 19039f6..f6eac60 100644</span><br><span>--- a/src/sgsn/sgsn_main.c</span><br><span>+++ b/src/sgsn/sgsn_main.c</span><br><span>@@ -328,11 +328,6 @@</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_sockaddr_str bind_address = {</span><br><span style="color: hsl(0, 100%, 40%);">- .af = AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- .ip = "0.0.0.0",</span><br><span style="color: hsl(0, 100%, 40%);">- .port = 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span> #if BUILD_IU</span><br><span> struct osmo_sccp_instance *sccp;</span><br><span> #endif</span><br><span>@@ -402,7 +397,7 @@</span><br><span> sgsn_inst_init(sgsn);</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_vty_init(sgsn_nsi, &bind_address);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_vty_init(sgsn_nsi);</span><br><span> bssgp_vty_init();</span><br><span> gprs_llc_vty_init();</span><br><span> gprs_sndcp_vty_init();</span><br><span>@@ -449,12 +444,6 @@</span><br><span> exit(2);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = gprs_ns2_vty_create();</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DGPRS, LOGL_FATAL, "Cannot bind/listen on NSIP socket\n");</span><br><span style="color: hsl(0, 100%, 40%);">- exit(2);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> gprs_ns2_dynamic_create_nse(sgsn_nsi, true);</span><br><span> </span><br><span> if (sgsn->cfg.dynamic_lookup) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/22501">change 22501</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-sgsn/+/22501"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie9306ab4d4738c2c57a69987086e22771b30657e </div>
<div style="display:none"> Gerrit-Change-Number: 22501 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>