From 87038afe86f4fc9904c2b40f165de37204675699 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 1 Nov 2017 00:59:35 +0100 Subject: vty: skip installing cmds now always installed by default vty_install_default() and install_default() will soon be deprecated. Depends: I5021c64a787b63314e0f2f1cba0b8fc7bff4f09b Change-Id: I300a4b34a2031fd09d110ef18375d140a6dca7ba --- src/host/layer23/src/mobile/vty_interface.c | 3 --- src/shared/libosmocore/src/gb/gprs_bssgp_vty.c | 1 - src/shared/libosmocore/src/gb/gprs_ns_vty.c | 1 - src/shared/libosmocore/src/vty/logging_vty.c | 1 - src/shared/libosmocore/src/vty/vty.c | 1 - 5 files changed, 7 deletions(-) diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 06f66b59..9a4ae637 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -2837,7 +2837,6 @@ int ms_vty_init(void) install_element(CONFIG_NODE, &cfg_ms_rename_cmd); install_element(CONFIG_NODE, &cfg_no_ms_cmd); install_node(&ms_node, config_write); - install_default(MS_NODE); install_element(MS_NODE, &cfg_ms_show_this_cmd); install_element(MS_NODE, &cfg_ms_layer2_cmd); install_element(MS_NODE, &cfg_ms_sap_cmd); @@ -2880,7 +2879,6 @@ int ms_vty_init(void) install_element(MS_NODE, &cfg_ms_no_neighbour_cmd); install_element(MS_NODE, &cfg_ms_support_cmd); install_node(&support_node, config_write_dummy); - install_default(SUPPORT_NODE); install_element(SUPPORT_NODE, &cfg_ms_sup_dtmf_cmd); install_element(SUPPORT_NODE, &cfg_ms_sup_no_dtmf_cmd); install_element(SUPPORT_NODE, &cfg_ms_sup_sms_cmd); @@ -2936,7 +2934,6 @@ int ms_vty_init(void) install_element(SUPPORT_NODE, &cfg_ms_sup_skip_max_per_band_cmd); install_element(SUPPORT_NODE, &cfg_ms_sup_no_skip_max_per_band_cmd); install_node(&testsim_node, config_write_dummy); - install_default(TESTSIM_NODE); install_element(TESTSIM_NODE, &cfg_test_imsi_cmd); install_element(TESTSIM_NODE, &cfg_test_ki_xor_cmd); install_element(TESTSIM_NODE, &cfg_test_ki_comp128_cmd); diff --git a/src/shared/libosmocore/src/gb/gprs_bssgp_vty.c b/src/shared/libosmocore/src/gb/gprs_bssgp_vty.c index d8e1d32f..7017c504 100644 --- a/src/shared/libosmocore/src/gb/gprs_bssgp_vty.c +++ b/src/shared/libosmocore/src/gb/gprs_bssgp_vty.c @@ -189,7 +189,6 @@ int bssgp_vty_init(void) install_element(CONFIG_NODE, &cfg_bssgp_cmd); install_node(&bssgp_node, config_write_bssgp); - install_default(L_BSSGP_NODE); install_element(L_BSSGP_NODE, &libgb_exit_cmd); install_element(L_BSSGP_NODE, &libgb_end_cmd); //install_element(L_BSSGP_NODE, &cfg_bssgp_timer_cmd); diff --git a/src/shared/libosmocore/src/gb/gprs_ns_vty.c b/src/shared/libosmocore/src/gb/gprs_ns_vty.c index fac431cb..b4436019 100644 --- a/src/shared/libosmocore/src/gb/gprs_ns_vty.c +++ b/src/shared/libosmocore/src/gb/gprs_ns_vty.c @@ -559,7 +559,6 @@ int gprs_ns_vty_init(struct gprs_ns_inst *nsi) install_element(CONFIG_NODE, &cfg_ns_cmd); install_node(&ns_node, config_write_ns); - install_default(L_NS_NODE); install_element(L_NS_NODE, &libgb_exit_cmd); install_element(L_NS_NODE, &libgb_end_cmd); install_element(L_NS_NODE, &cfg_nse_nsvci_cmd); diff --git a/src/shared/libosmocore/src/vty/logging_vty.c b/src/shared/libosmocore/src/vty/logging_vty.c index d473f129..6029d58b 100644 --- a/src/shared/libosmocore/src/vty/logging_vty.c +++ b/src/shared/libosmocore/src/vty/logging_vty.c @@ -592,7 +592,6 @@ void logging_vty_add_cmds(const struct log_info *cat) install_element_ve(&show_logging_vty_cmd); install_node(&cfg_log_node, config_write_log); - install_default(CFG_LOG_NODE); install_element(CFG_LOG_NODE, &config_end_cmd); install_element(CFG_LOG_NODE, &logging_fltr_all_cmd); install_element(CFG_LOG_NODE, &logging_use_clr_cmd); diff --git a/src/shared/libosmocore/src/vty/vty.c b/src/shared/libosmocore/src/vty/vty.c index 696766a9..cafe2028 100644 --- a/src/shared/libosmocore/src/vty/vty.c +++ b/src/shared/libosmocore/src/vty/vty.c @@ -1753,7 +1753,6 @@ void vty_init(struct vty_app_info *app_info) install_element(ENABLE_NODE, &terminal_monitor_cmd); install_element(ENABLE_NODE, &terminal_no_monitor_cmd); - install_default(VTY_NODE); install_element(VTY_NODE, &vty_login_cmd); install_element(VTY_NODE, &no_vty_login_cmd); } -- cgit v1.2.3