<p>lynxis lazus <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21819">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: use ns2 vty2<br><br>The new gprs_ns2 vty2 support ip-sns and reorganize the<br>network service configuration<br><br>Depends: I163279cf57e84198dc8c53e1c109f5a9474670e9 (libosmocore)<br>Change-Id: I2a18dcf035f1fc7304a0c7c7c83b5e8e15429d2b<br>---<br>M doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg<br>M doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg<br>M doc/examples/osmo-gbproxy/osmo-gbproxy.cfg<br>M src/gbproxy/gb_proxy_main.c<br>4 files changed, 18 insertions(+), 37 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg b/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg</span><br><span>index c1dcfe7..e30b9f7 100644</span><br><span>--- a/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg</span><br><span>+++ b/doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg</span><br><span>@@ -22,12 +22,11 @@</span><br><span> no login</span><br><span> !</span><br><span> ns</span><br><span style="color: hsl(0, 100%, 40%);">- nse 666 nsvci 666</span><br><span style="color: hsl(0, 100%, 40%);">- nse 666 remote-role sgsn</span><br><span style="color: hsl(0, 100%, 40%);">-! nse 666 encapsulation framerelay-gre</span><br><span style="color: hsl(0, 100%, 40%);">- nse 666 remote-ip 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">- nse 666 remote-port 23001</span><br><span style="color: hsl(0, 100%, 40%);">-! nse 666 fr-dlci 666</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 style="color: hsl(120, 100%, 40%);">+ nse 666</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc ipa local 127.0.0.1 23001 nsvci 666</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>@@ -35,9 +34,6 @@</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-port 23000</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 framerelay-gre enabled 1</span><br><span> gbproxy</span><br><span> sgsn nsei 666</span><br><span> core-mobile-country-code 666</span><br><span>diff --git a/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg b/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg</span><br><span>index df765c0..a5e8967 100644</span><br><span>--- a/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg</span><br><span>+++ b/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg</span><br><span>@@ -15,16 +15,13 @@</span><br><span> nri add 2</span><br><span> nri add 12</span><br><span> ns</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 nsvci 101</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 remote-role sgsn</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 encapsulation udp</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 remote-ip 192.168.100.239</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 remote-port 7777</span><br><span style="color: hsl(0, 100%, 40%);">- nse 102 nsvci 102</span><br><span style="color: hsl(0, 100%, 40%);">- nse 102 remote-role sgsn</span><br><span style="color: hsl(0, 100%, 40%);">- nse 102 encapsulation udp</span><br><span style="color: hsl(0, 100%, 40%);">- nse 102 remote-ip 192.168.100.239</span><br><span style="color: hsl(0, 100%, 40%);">- nse 102 remote-port 7778</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.100 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-ipaccess</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc ipa local 192.168.100.239 7777 nsvci 101</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 102</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc ipa local 192.168.100.239 7778 nsvci 102</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>@@ -32,7 +29,3 @@</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 framerelay-gre enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation framerelay-gre local-ip 0.0.0.0</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-ip 127.0.0.100</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-port 23000</span><br><span>diff --git a/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg b/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg</span><br><span>index 5cabc6d..0a2c16e 100644</span><br><span>--- a/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg</span><br><span>+++ b/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg</span><br><span>@@ -8,11 +8,11 @@</span><br><span> gbproxy</span><br><span> sgsn nsei 101</span><br><span> ns</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 nsvci 101</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 remote-role sgsn</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 encapsulation udp</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 remote-ip 192.168.100.239</span><br><span style="color: hsl(0, 100%, 40%);">- nse 101 remote-port 7777</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.100 23000</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-ipaccess</span><br><span style="color: hsl(120, 100%, 40%);">+ nse 101</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc ipa local 192.168.100.239 7777 nsvci 101</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>@@ -20,7 +20,3 @@</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 framerelay-gre enabled 0</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation framerelay-gre local-ip 0.0.0.0</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-ip 127.0.0.100</span><br><span style="color: hsl(0, 100%, 40%);">- encapsulation udp local-port 23000</span><br><span>diff --git a/src/gbproxy/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c</span><br><span>index c660ede..37afb5e 100644</span><br><span>--- a/src/gbproxy/gb_proxy_main.c</span><br><span>+++ b/src/gbproxy/gb_proxy_main.c</span><br><span>@@ -289,7 +289,7 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_vty_init(gbcfg->nsi, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_vty2_init(gbcfg->nsi);</span><br><span> logging_vty_add_deprecated_subsys(tall_sgsn_ctx, "bssgp");</span><br><span> gprs_ns2_dynamic_create_nse(gbcfg->nsi, true);</span><br><span> </span><br><span>@@ -301,10 +301,6 @@</span><br><span> exit(2);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_vty_create();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: Warn if we create a gbproxy_nse for an NSEI which we don't have a bind */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* start telnet after reading config for vty_get_bind_addr() */</span><br><span> rc = telnet_init_dynif(tall_sgsn_ctx, NULL,</span><br><span> vty_get_bind_addr(), OSMO_VTY_PORT_GBPROXY);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21819">change 21819</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/+/21819"/><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: I2a18dcf035f1fc7304a0c7c7c83b5e8e15429d2b </div>
<div style="display:none"> Gerrit-Change-Number: 21819 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>