*: move CLI parent data to cmd_node->parent_node

[mirror_frr.git] / lib / command.c

diff --git a/lib/command.c b/lib/command.c
index 9238ae412ab9c087be8bf9129be603fc95193ef2..dad35bfbf86fffb5e705154a84fd514292b6df54 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -181,22 +181,32 @@ const char *cmd_domainname_get(void)
 
 /* Standard command node structures. */
 static struct cmd_node auth_node = {
-       AUTH_NODE, "Password: ",
+       .node = AUTH_NODE,
+       .prompt = "Password: ",
 };
 
 static struct cmd_node view_node = {
-       VIEW_NODE, "%s> ",
+       .node = VIEW_NODE,
+       .prompt = "%s> ",
 };
 
 static struct cmd_node auth_enable_node = {
-       AUTH_ENABLE_NODE, "Password: ",
+       .node = AUTH_ENABLE_NODE,
+       .prompt = "Password: ",
 };
 
 static struct cmd_node enable_node = {
-       ENABLE_NODE, "%s# ",
+       .node = ENABLE_NODE,
+       .prompt = "%s# ",
 };
 
-static struct cmd_node config_node = {CONFIG_NODE, "%s(config)# ", 1};
+static int config_write_host(struct vty *vty);
+static struct cmd_node config_node = {
+       .node = CONFIG_NODE,
+       .parent_node = ENABLE_NODE,
+       .prompt = "%s(config)# ",
+       .config_write = config_write_host,
+};
 
 static const struct facility_map {
        int facility;
@@ -345,10 +355,9 @@ static bool cmd_hash_cmp(const void *a, const void *b)
 }
 
 /* Install top node of command vector. */
-void install_node(struct cmd_node *node, int (*func)(struct vty *))
+void install_node(struct cmd_node *node)
 {
        vector_set_index(cmdvec, node->node, node);
-       node->func = func;
        node->cmdgraph = graph_new();
        node->cmd_vector = vector_init(VECTOR_MIN_SIZE);
        // add start node
@@ -1450,6 +1459,8 @@ DEFUN (config_exit,
 
 void cmd_exit(struct vty *vty)
 {
+       struct cmd_node *cnode = vector_lookup(cmdvec, vty->node);
+
        switch (vty->node) {
        case VIEW_NODE:
        case ENABLE_NODE:
@@ -1462,73 +1473,9 @@ void cmd_exit(struct vty *vty)
                vty->node = ENABLE_NODE;
                vty_config_exit(vty);
                break;
-       case INTERFACE_NODE:
-       case PW_NODE:
-       case VRF_NODE:
-       case NH_GROUP_NODE:
-       case ZEBRA_NODE:
-       case BGP_NODE:
-       case RIP_NODE:
-       case EIGRP_NODE:
-       case BABEL_NODE:
-       case RIPNG_NODE:
-       case OSPF_NODE:
-       case OSPF6_NODE:
-       case LDP_NODE:
-       case LDP_L2VPN_NODE:
-       case ISIS_NODE:
-       case OPENFABRIC_NODE:
-       case KEYCHAIN_NODE:
-       case RMAP_NODE:
-       case PBRMAP_NODE:
-       case VTY_NODE:
-       case BFD_NODE:
-               vty->node = CONFIG_NODE;
-               break;
-       case BGP_IPV4_NODE:
-       case BGP_IPV4M_NODE:
-       case BGP_IPV4L_NODE:
-       case BGP_VPNV4_NODE:
-       case BGP_VPNV6_NODE:
-       case BGP_FLOWSPECV4_NODE:
-       case BGP_FLOWSPECV6_NODE:
-       case BGP_VRF_POLICY_NODE:
-       case BGP_VNC_DEFAULTS_NODE:
-       case BGP_VNC_NVE_GROUP_NODE:
-       case BGP_VNC_L2_GROUP_NODE:
-       case BGP_IPV6_NODE:
-       case BGP_IPV6M_NODE:
-       case BGP_EVPN_NODE:
-       case BGP_IPV6L_NODE:
-       case BMP_NODE:
-               vty->node = BGP_NODE;
-               break;
-       case BGP_EVPN_VNI_NODE:
-               vty->node = BGP_EVPN_NODE;
-               break;
-       case LDP_IPV4_NODE:
-       case LDP_IPV6_NODE:
-               vty->node = LDP_NODE;
-               break;
-       case LDP_IPV4_IFACE_NODE:
-               vty->node = LDP_IPV4_NODE;
-               break;
-       case LDP_IPV6_IFACE_NODE:
-               vty->node = LDP_IPV6_NODE;
-               break;
-       case LDP_PSEUDOWIRE_NODE:
-               vty->node = LDP_L2VPN_NODE;
-               break;
-       case KEYCHAIN_KEY_NODE:
-               vty->node = KEYCHAIN_NODE;
-               break;
-       case LINK_PARAMS_NODE:
-               vty->node = INTERFACE_NODE;
-               break;
-       case BFD_PEER_NODE:
-               vty->node = BFD_NODE;
-               break;
        default:
+               if (cnode->parent_node)
+                       vty->node = cnode->parent_node;
                break;
        }
 
@@ -1556,7 +1503,6 @@ DEFUN (config_end,
                vty_config_exit(vty);
                vty->node = ENABLE_NODE;
        }
-
        return CMD_SUCCESS;
 }
 
@@ -1575,18 +1521,6 @@ DEFUN (show_version,
        return CMD_SUCCESS;
 }
 
-/* "Set" version ... ignore version tags */
-DEFUN (frr_version_defaults,
-       frr_version_defaults_cmd,
-       "frr <version|defaults> LINE...",
-       "FRRouting global parameters\n"
-       "version configuration was written by\n"
-       "set of configuration defaults used\n"
-       "version string\n")
-{
-       return CMD_SUCCESS;
-}
-
 /* Help display function for all node. */
 DEFUN (config_help,
        config_help_cmd,
@@ -1721,14 +1655,15 @@ static int vty_write_config(struct vty *vty)
                vty_out(vty, "!\n");
        }
 
+       if (strcmp(frr_defaults_version(), FRR_VER_SHORT))
+               vty_out(vty, "! loaded from %s\n", frr_defaults_version());
        vty_out(vty, "frr version %s\n", FRR_VER_SHORT);
-       vty_out(vty, "frr defaults %s\n", DFLT_NAME);
+       vty_out(vty, "frr defaults %s\n", frr_defaults_profile());
        vty_out(vty, "!\n");
 
        for (i = 0; i < vector_active(cmdvec); i++)
-               if ((node = vector_slot(cmdvec, i)) && node->func
-                   && (node->vtysh || vty->type != VTY_SHELL)) {
-                       if ((*node->func)(vty))
+               if ((node = vector_slot(cmdvec, i)) && node->config_write) {
+                       if ((*node->config_write)(vty))
                                vty_out(vty, "!\n");
                }
 
@@ -2513,8 +2448,6 @@ static void disable_log_file(void)
        zlog_reset_file();
 
        XFREE(MTYPE_HOST, host.logfile);
-
-       host.logfile = NULL;
 }
 
 DEFUN (no_config_log_file,
@@ -2671,8 +2604,7 @@ int cmd_banner_motd_file(const char *file)
 
 void cmd_banner_motd_line(const char *line)
 {
-       if (host.motd)
-               XFREE(MTYPE_HOST, host.motd);
+       XFREE(MTYPE_HOST, host.motd);
        host.motd = XSTRDUP(MTYPE_HOST, line);
 }
 
@@ -2896,11 +2828,11 @@ void cmd_init(int terminal)
        host.motdfile = NULL;
 
        /* Install top nodes. */
-       install_node(&view_node, NULL);
-       install_node(&enable_node, NULL);
-       install_node(&auth_node, NULL);
-       install_node(&auth_enable_node, NULL);
-       install_node(&config_node, config_write_host);
+       install_node(&view_node);
+       install_node(&enable_node);
+       install_node(&auth_node);
+       install_node(&auth_enable_node);
+       install_node(&config_node);
 
        /* Each node's basic commands. */
        install_element(VIEW_NODE, &show_version_cmd);
@@ -2941,7 +2873,6 @@ void cmd_init(int terminal)
        install_element(CONFIG_NODE, &no_hostname_cmd);
        install_element(CONFIG_NODE, &domainname_cmd);
        install_element(CONFIG_NODE, &no_domainname_cmd);
-       install_element(CONFIG_NODE, &frr_version_defaults_cmd);
 
        if (terminal > 0) {
                install_element(CONFIG_NODE, &debug_memstats_cmd);