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/include/openbsc | |
parent | 4f1e81543abea8cfb6b55c09e342831863d7a134 (diff) |
Migrate VTY code to libosmovty
Diffstat (limited to 'openbsc/include/openbsc')
-rw-r--r-- | openbsc/include/openbsc/Makefile.am | 2 | ||||
-rw-r--r-- | openbsc/include/openbsc/debug.h | 3 | ||||
-rw-r--r-- | openbsc/include/openbsc/gb_proxy.h | 2 | ||||
-rw-r--r-- | openbsc/include/openbsc/telnet_interface.h | 40 | ||||
-rw-r--r-- | openbsc/include/openbsc/vty.h | 4 |
5 files changed, 4 insertions, 47 deletions
diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index 5abc4ddd0..416e907d1 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -1,6 +1,6 @@ noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.h \ gsm_subscriber.h gsm_04_11.h debug.h signal.h \ - misdn.h chan_alloc.h telnet_interface.h paging.h \ + misdn.h chan_alloc.h paging.h \ subchan_demux.h trau_frame.h e1_input.h trau_mux.h \ ipaccess.h rs232.h openbscdefines.h rtp_proxy.h \ bsc_rll.h mncc.h transaction.h ussd.h gsm_04_80.h \ diff --git a/openbsc/include/openbsc/debug.h b/openbsc/include/openbsc/debug.h index de1e2e2c6..203aedb83 100644 --- a/openbsc/include/openbsc/debug.h +++ b/openbsc/include/openbsc/debug.h @@ -45,9 +45,6 @@ enum { #define BSC_CTX_NSVC 4 #define BSC_CTX_BVC 5 -#define LOGGING_STR "Configure log message to this terminal\n" -#define FILTER_STR "Filter log messages\n" - /* target */ enum { diff --git a/openbsc/include/openbsc/gb_proxy.h b/openbsc/include/openbsc/gb_proxy.h index ed1ac2de2..18ded2295 100644 --- a/openbsc/include/openbsc/gb_proxy.h +++ b/openbsc/include/openbsc/gb_proxy.h @@ -6,7 +6,7 @@ #include <osmocore/msgb.h> #include <openbsc/gprs_ns.h> -#include <vty/command.h> +#include <osmocom/vty/command.h> struct gbproxy_config { /* parsed from config file */ diff --git a/openbsc/include/openbsc/telnet_interface.h b/openbsc/include/openbsc/telnet_interface.h deleted file mode 100644 index 5a3e17930..000000000 --- a/openbsc/include/openbsc/telnet_interface.h +++ /dev/null @@ -1,40 +0,0 @@ -/* minimalistic telnet/network interface it might turn into a wire interface */ -/* (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org> - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#ifndef TELNET_INTERFACE_H -#define TELNET_INTERFACE_H - -#include <osmocore/logging.h> -#include <osmocore/select.h> - -#include <vty/vty.h> - -struct telnet_connection { - struct llist_head entry; - void *priv; - struct bsc_fd fd; - struct vty *vty; - struct log_target *dbg; -}; - - -int telnet_init(void *tall_ctx, void *priv, int port); - -#endif diff --git a/openbsc/include/openbsc/vty.h b/openbsc/include/openbsc/vty.h index 2adbded0d..26e7d5e4d 100644 --- a/openbsc/include/openbsc/vty.h +++ b/openbsc/include/openbsc/vty.h @@ -1,8 +1,8 @@ #ifndef OPENBSC_VTY_H #define OPENBSC_VTY_H -#include <vty/vty.h> -#include <vty/buffer.h> +#include <osmocom/vty/vty.h> +#include <osmocom/vty/buffer.h> struct gsm_network; struct vty; |