From fcd4026e7b48942e31d0efaa7f091e4ae50a8e1a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Mon, 24 Feb 2014 13:03:33 +0100 Subject: Revert "bts/vty: Use new vty_install_default() function, adjust prompts" This reverts commit bbfd21a36cdd10c3b8d83a329042d9ebfb4c5250. --- src/common/vty.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) (limited to 'src/common/vty.c') diff --git a/src/common/vty.c b/src/common/vty.c index d818f3f5..5eddc8df 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -71,6 +71,37 @@ int bts_vty_is_config_node(struct vty *vty, int node) } } +gDEFUN(ournode_exit, ournode_exit_cmd, "exit", + "Exit current node, go down to provious node") +{ + switch (vty->node) { + case TRX_NODE: + vty->node = BTS_NODE; + { + struct gsm_bts_trx *trx = vty->index; + vty->index = trx->bts; + } + break; + default: + break; + } + return CMD_SUCCESS; +} + +gDEFUN(ournode_end, ournode_end_cmd, "end", + "End current mode and change to enable mode") +{ + switch (vty->node) { + default: + vty_config_unlock(vty); + vty->node = ENABLE_NODE; + vty->index = NULL; + vty->index_sub = NULL; + break; + } + return CMD_SUCCESS; +} + static const char osmobts_copyright[] = "Copyright (C) 2010, 2011 by Harald Welte, Andreas Eversberg and On-Waves\r\n" "License AGPLv3+: GNU AGPL version 3 or later \r\n" @@ -109,13 +140,13 @@ struct gsm_bts *gsm_bts_num(struct gsm_network *net, int num) static struct cmd_node bts_node = { BTS_NODE, - "%s(config-bts)# ", + "%s(bts)#", 1, }; static struct cmd_node trx_node = { TRX_NODE, - "%s(config-bts-trx)# ", + "%s(trx)#", 1, }; @@ -478,7 +509,7 @@ int bts_vty_init(const struct log_info *cat) install_node(&bts_node, config_write_bts); install_element(CONFIG_NODE, &cfg_bts_cmd); - vty_install_default(BTS_NODE); + install_default(BTS_NODE); install_element(BTS_NODE, &cfg_bts_unit_id_cmd); install_element(BTS_NODE, &cfg_bts_oml_ip_cmd); install_element(BTS_NODE, &cfg_bts_rtp_bind_ip_cmd); @@ -492,7 +523,7 @@ int bts_vty_init(const struct log_info *cat) /* add and link to TRX config node */ install_element(BTS_NODE, &cfg_bts_trx_cmd); install_node(&trx_node, config_write_dummy); - vty_install_default(TRX_NODE); + install_default(TRX_NODE); install_element(ENABLE_NODE, &bts_t_t_l_jitter_buf_cmd); -- cgit v1.2.3