cellular-infrastructure
/
osmo-gbproxy
mirror of https://gerrit.osmocom.org/osmo-gbproxy
9
0
Fork 0
Code Issues Releases Wiki Activity

gbproxy: use ns2 vty2 

The new gprs_ns2 vty2 support ip-sns and reorganize the
network service configuration

Depends: I163279cf57e84198dc8c53e1c109f5a9474670e9 (libosmocore)
Change-Id: I2a18dcf035f1fc7304a0c7c7c83b5e8e15429d2b
This commit is contained in:
Alexander Couzens 2020-12-21 12:56:01 +01:00 committed by lynxis lazus
parent 008de61e08
commit 7305ba3f1c
4 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/examples/osmo-gbproxy/osmo-gbproxy-legacy.cfg
View File

@ -22,12 +22,11 @@ line vty
no login
!
ns
nse 666 nsvci 666
nse 666 remote-role sgsn
! nse 666 encapsulation framerelay-gre
nse 666 remote-ip 127.0.0.1
nse 666 remote-port 23001
! nse 666 fr-dlci 666
bind udp local
listen 127.0.0.1 23000
accept-ipaccess
nse 666
nsvc ipa local 127.0.0.1 23001 nsvci 666
timer tns-block 3
timer tns-block-retries 3
timer tns-reset 3
@ -35,9 +34,6 @@ ns
timer tns-test 30
timer tns-alive 3
timer tns-alive-retries 10
encapsulation udp local-port 23000
encapsulation udp local-ip 127.0.0.1
! encapsulation framerelay-gre enabled 1
gbproxy
sgsn nsei 666
core-mobile-country-code 666

21
doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg
View File

@ -15,16 +15,13 @@ sgsn nsei 102
nri add 2
nri add 12
ns
nse 101 nsvci 101
nse 101 remote-role sgsn
nse 101 encapsulation udp
nse 101 remote-ip 192.168.100.239
nse 101 remote-port 7777
nse 102 nsvci 102
nse 102 remote-role sgsn
nse 102 encapsulation udp
nse 102 remote-ip 192.168.100.239
nse 102 remote-port 7778
bind udp local
listen 127.0.0.100 23000
accept-ipaccess
nse 101
nsvc ipa local 192.168.100.239 7777 nsvci 101
nse 102
nsvc ipa local 192.168.100.239 7778 nsvci 102
timer tns-block 3
timer tns-block-retries 3
timer tns-reset 3
@ -32,7 +29,3 @@ ns
timer tns-test 30
timer tns-alive 3
timer tns-alive-retries 10
encapsulation framerelay-gre enabled 0
encapsulation framerelay-gre local-ip 0.0.0.0
encapsulation udp local-ip 127.0.0.100
encapsulation udp local-port 23000

14
doc/examples/osmo-gbproxy/osmo-gbproxy.cfg
View File

@ -8,11 +8,11 @@ line vty
gbproxy
sgsn nsei 101
ns
nse 101 nsvci 101
nse 101 remote-role sgsn
nse 101 encapsulation udp
nse 101 remote-ip 192.168.100.239
nse 101 remote-port 7777
bind udp local
listen 127.0.0.100 23000
accept-ipaccess
nse 101
nsvc ipa local 192.168.100.239 7777 nsvci 101
timer tns-block 3
timer tns-block-retries 3
timer tns-reset 3
@ -20,7 +20,3 @@ ns
timer tns-test 30
timer tns-alive 3
timer tns-alive-retries 10
encapsulation framerelay-gre enabled 0
encapsulation framerelay-gre local-ip 0.0.0.0
encapsulation udp local-ip 127.0.0.100
encapsulation udp local-port 23000

6
src/gb_proxy_main.c
View File

@ -289,7 +289,7 @@ int main(int argc, char **argv)
exit(1);
}
gprs_ns2_vty_init(gbcfg->nsi, NULL);
gprs_ns2_vty2_init(gbcfg->nsi);
logging_vty_add_deprecated_subsys(tall_sgsn_ctx, "bssgp");
gprs_ns2_dynamic_create_nse(gbcfg->nsi, true);
@ -301,10 +301,6 @@ int main(int argc, char **argv)
exit(2);
}
gprs_ns2_vty_create();
/* TODO: Warn if we create a gbproxy_nse for an NSEI which we don't have a bind */
/* start telnet after reading config for vty_get_bind_addr() */
rc = telnet_init_dynif(tall_sgsn_ctx, NULL,
vty_get_bind_addr(), OSMO_VTY_PORT_GBPROXY);