diff options
author | Harald Welte <laforge@gnumonks.org> | 2010-05-19 19:45:32 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2010-05-25 23:40:38 +0200 |
commit | 4b037e4117c0c1e02a516c8b3374444f438c70e1 (patch) | |
tree | c2c02920c333c33f728b4d3dbe63a45635b1b61b /openbsc/src/gprs | |
parent | 4f1e81543abea8cfb6b55c09e342831863d7a134 (diff) |
Migrate VTY code to libosmovty
Diffstat (limited to 'openbsc/src/gprs')
-rw-r--r-- | openbsc/src/gprs/Makefile.am | 4 | ||||
-rw-r--r-- | openbsc/src/gprs/gb_proxy.c | 2 | ||||
-rw-r--r-- | openbsc/src/gprs/gb_proxy_main.c | 4 | ||||
-rw-r--r-- | openbsc/src/gprs/gb_proxy_vty.c | 4 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_bssgp_vty.c | 7 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_llc_vty.c | 4 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_ns_vty.c | 7 | ||||
-rw-r--r-- | openbsc/src/gprs/osmo_sgsn.cfg | 4 | ||||
-rw-r--r-- | openbsc/src/gprs/sgsn_main.c | 3 | ||||
-rw-r--r-- | openbsc/src/gprs/sgsn_vty.c | 4 |
10 files changed, 24 insertions, 19 deletions
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am index 191f6193c..11b2ac934 100644 --- a/openbsc/src/gprs/Makefile.am +++ b/openbsc/src/gprs/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) -fno-strict-aliasing -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) +AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) noinst_LIBRARIES = libgb.a diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index 26c9e4fe9..b6fbac77e 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -567,7 +567,7 @@ int gbprox_signal(unsigned int subsys, unsigned int signal, } -#include <vty/command.h> +#include <osmocom/vty/command.h> gDEFUN(show_gbproxy, show_gbproxy_cmd, "show gbproxy", SHOW_STR "Display information about the Gb proxy") diff --git a/openbsc/src/gprs/gb_proxy_main.c b/openbsc/src/gprs/gb_proxy_main.c index 71d608609..208ae47ca 100644 --- a/openbsc/src/gprs/gb_proxy_main.c +++ b/openbsc/src/gprs/gb_proxy_main.c @@ -42,11 +42,11 @@ #include <openbsc/debug.h> #include <openbsc/gprs_ns.h> #include <openbsc/gprs_bssgp.h> -#include <openbsc/telnet_interface.h> #include <openbsc/vty.h> #include <openbsc/gb_proxy.h> -#include <vty/command.h> +#include <osmocom/vty/command.h> +#include <osmocom/vty/telnet_interface.h> #include "../../bscconfig.h" diff --git a/openbsc/src/gprs/gb_proxy_vty.c b/openbsc/src/gprs/gb_proxy_vty.c index 738adcfef..7b6d2dab9 100644 --- a/openbsc/src/gprs/gb_proxy_vty.c +++ b/openbsc/src/gprs/gb_proxy_vty.c @@ -31,8 +31,8 @@ #include <openbsc/gprs_ns.h> #include <openbsc/vty.h> -#include <vty/command.h> -#include <vty/vty.h> +#include <osmocom/vty/command.h> +#include <osmocom/vty/vty.h> static struct gbproxy_config *g_cfg = NULL; diff --git a/openbsc/src/gprs/gprs_bssgp_vty.c b/openbsc/src/gprs/gprs_bssgp_vty.c index 8377c56e8..9da02abb3 100644 --- a/openbsc/src/gprs/gprs_bssgp_vty.c +++ b/openbsc/src/gprs/gprs_bssgp_vty.c @@ -37,11 +37,12 @@ #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> #include <openbsc/gprs_bssgp.h> -#include <openbsc/telnet_interface.h> #include <openbsc/vty.h> -#include <vty/vty.h> -#include <vty/command.h> +#include <osmocom/vty/vty.h> +#include <osmocom/vty/command.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/telnet_interface.h> /* FIXME: this should go to some common file as it is copied * in vty_interface.c of the BSC */ diff --git a/openbsc/src/gprs/gprs_llc_vty.c b/openbsc/src/gprs/gprs_llc_vty.c index 510ef64f0..9c7f5568e 100644 --- a/openbsc/src/gprs/gprs_llc_vty.c +++ b/openbsc/src/gprs/gprs_llc_vty.c @@ -37,8 +37,8 @@ #include <openbsc/signal.h> #include <openbsc/gprs_llc.h> -#include <vty/vty.h> -#include <vty/command.h> +#include <osmocom/vty/vty.h> +#include <osmocom/vty/command.h> struct value_string gprs_llc_state_strs[] = { { GPRS_LLS_UNASSIGNED, "TLLI Unassigned" }, diff --git a/openbsc/src/gprs/gprs_ns_vty.c b/openbsc/src/gprs/gprs_ns_vty.c index 423ac205a..81346c6ef 100644 --- a/openbsc/src/gprs/gprs_ns_vty.c +++ b/openbsc/src/gprs/gprs_ns_vty.c @@ -37,11 +37,12 @@ #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> #include <openbsc/gprs_bssgp.h> -#include <openbsc/telnet_interface.h> #include <openbsc/vty.h> -#include <vty/vty.h> -#include <vty/command.h> +#include <osmocom/vty/vty.h> +#include <osmocom/vty/command.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/telnet_interface.h> static struct gprs_ns_inst *vty_nsi = NULL; diff --git a/openbsc/src/gprs/osmo_sgsn.cfg b/openbsc/src/gprs/osmo_sgsn.cfg index d3d4bb2a4..298d2d6f0 100644 --- a/openbsc/src/gprs/osmo_sgsn.cfg +++ b/openbsc/src/gprs/osmo_sgsn.cfg @@ -6,10 +6,12 @@ line vty no login ! sgsn - ggsn 0 remote-ip 192.168.100.239 + ggsn 0 remote-ip 127.0.0.1 ggsn 0 gtp-version 1 ns + encapsulation udp local-ip 192.168.100.239 encapsulation udp local-port 23000 + encapsulation framerelay-gre enabled 1 timer tns-block 3 timer tns-block-retries 3 timer tns-reset 3 diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c index 7c5afe55c..4ed498042 100644 --- a/openbsc/src/gprs/sgsn_main.c +++ b/openbsc/src/gprs/sgsn_main.c @@ -38,9 +38,10 @@ #include <osmocore/select.h> #include <osmocore/rate_ctr.h> +#include <osmocom/vty/telnet_interface.h> + #include <openbsc/signal.h> #include <openbsc/debug.h> -#include <openbsc/telnet_interface.h> #include <openbsc/vty.h> #include <openbsc/sgsn.h> #include <openbsc/gprs_ns.h> diff --git a/openbsc/src/gprs/sgsn_vty.c b/openbsc/src/gprs/sgsn_vty.c index 2532a8840..34dd8c646 100644 --- a/openbsc/src/gprs/sgsn_vty.c +++ b/openbsc/src/gprs/sgsn_vty.c @@ -34,8 +34,8 @@ #include <openbsc/gprs_sgsn.h> #include <openbsc/vty.h> -#include <vty/command.h> -#include <vty/vty.h> +#include <osmocom/vty/command.h> +#include <osmocom/vty/vty.h> #include <pdp.h> |