diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-22 03:25:11 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-03-24 06:16:04 +0100 |
| commit | 22481bf76d129d3c41d20b96b6587ef085be485b (patch) | |
| tree | 8c8de852e945dd5422a83bc7e0c37548d2911fe2 /openbsc/src/vty/vty.c | |
| parent | b973955295b720b8ba7c556d0165750ed9bfb381 (diff) | |
| parent | 61b4232c6363ff9d78ef73b9dbf47ec16c94d610 (diff) | |
Merge remote branch 'origin/master' into on-waves/bsc-master
* Move to libosmocore
* Move to new debugging architecture
* Register the BTS types
* Has only been compile tested
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/include/openbsc/gsm_data.h
openbsc/include/openbsc/ipaccess.h
openbsc/include/openbsc/mgcp.h
openbsc/include/openbsc/msgb.h
openbsc/include/openbsc/tlv.h
openbsc/src/Makefile.am
openbsc/src/abis_rsl.c
openbsc/src/bsc_init.c
openbsc/src/bsc_mgcp.c
openbsc/src/chan_alloc.c
openbsc/src/debug.c
openbsc/src/gsm_subscriber_base.c
openbsc/src/msgb.c
openbsc/src/rest_octets.c
openbsc/src/sccp/sccp.c
openbsc/src/vty/command.c
openbsc/src/vty_interface.c
openbsc/tests/Makefile.am
Diffstat (limited to 'openbsc/src/vty/vty.c')
| -rw-r--r-- | openbsc/src/vty/vty.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openbsc/src/vty/vty.c b/openbsc/src/vty/vty.c index 788c7fd6f..1260f38c5 100644 --- a/openbsc/src/vty/vty.c +++ b/openbsc/src/vty/vty.c @@ -17,7 +17,7 @@ #include <vty/vty.h> #include <vty/command.h> #include <vty/buffer.h> -#include <openbsc/talloc.h> +#include <osmocore/talloc.h> /* our callback, located in telnet_interface.c */ void vty_event(enum event event, int sock, struct vty *vty); @@ -1633,6 +1633,8 @@ extern void *tall_bsc_ctx; void vty_init() { tall_vty_ctx = talloc_named_const(NULL, 0, "vty"); + tall_vty_vec_ctx = talloc_named_const(tall_vty_ctx, 0, "vty_vector"); + tall_vty_cmd_ctx = talloc_named_const(tall_vty_ctx, 0, "vty_command"); /* For further configuration read, preserve current directory. */ vty_save_cwd(); |