summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2017-10-14 15:03:59 +0200
committerHarald Welte <laforge@gnumonks.org>2017-10-14 15:03:59 +0200
commit1842487f27acf6b1bc44cd2b22fa85fb1af45dcd (patch)
treeeefcb9255d47c8443c7f7ffe7019ff4244be96ca
parentae31c37d2b4033fb2335060e4f7942ad5ad9549a (diff)
WIP / untested: remove ournode_{exit,end}_cmdlaforge/ournode-vty
Recent versions of libosmocore register their own 'exit' and 'end' commands to every node by default, so we *must* not register our own version of those commands anymore. This change is pending proper testing (do we really get into the right nodes at 'exit' point as in the old commands?) as well as a dependency on a higher libosmocore version tag! Change-Id: I9d55b606ac3aa0c38814da569d07a7066ac89495
-rw-r--r--src/host/layer23/src/mobile/vty_interface.c50
1 files changed, 0 insertions, 50 deletions
diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c
index b26d471..9a889e9 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -2777,50 +2777,6 @@ enum node_type ms_vty_go_parent(struct vty *vty)
return vty->node;
}
-/* Down vty node level. */
-gDEFUN(ournode_exit,
- ournode_exit_cmd, "exit", "Exit current mode and down to previous mode\n")
-{
- switch (vty->node) {
- case MS_NODE:
- vty->node = CONFIG_NODE;
- vty->index = NULL;
- break;
- case TESTSIM_NODE:
- case SUPPORT_NODE:
- vty->node = MS_NODE;
- break;
- default:
- break;
- }
- return CMD_SUCCESS;
-}
-
-/* End of configuration. */
-gDEFUN(ournode_end,
- ournode_end_cmd, "end", "End current mode and change to enable mode.")
-{
- switch (vty->node) {
- case VIEW_NODE:
- case ENABLE_NODE:
- /* Nothing to do. */
- break;
- case CONFIG_NODE:
- case VTY_NODE:
- case MS_NODE:
- case TESTSIM_NODE:
- case SUPPORT_NODE:
- vty_config_unlock(vty);
- vty->node = ENABLE_NODE;
- vty->index = NULL;
- vty->index_sub = NULL;
- break;
- default:
- break;
- }
- return CMD_SUCCESS;
-}
-
DEFUN(off, off_cmd, "off",
"Turn mobiles off (shutdown) and exit")
{
@@ -2886,8 +2842,6 @@ int ms_vty_init(void)
install_element(CONFIG_NODE, &cfg_no_ms_cmd);
install_node(&ms_node, config_write);
install_default(MS_NODE);
- install_element(MS_NODE, &ournode_exit_cmd);
- install_element(MS_NODE, &ournode_end_cmd);
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);
@@ -2931,8 +2885,6 @@ int ms_vty_init(void)
install_element(MS_NODE, &cfg_ms_support_cmd);
install_node(&support_node, config_write_dummy);
install_default(SUPPORT_NODE);
- install_element(SUPPORT_NODE, &ournode_exit_cmd);
- install_element(SUPPORT_NODE, &ournode_end_cmd);
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);
@@ -2989,8 +2941,6 @@ int ms_vty_init(void)
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, &ournode_exit_cmd);
- install_element(TESTSIM_NODE, &ournode_end_cmd);
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);