proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 12:41:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: simplify detection of when the user is leaving the CLI config mode

Browse Source 
We can make use of the vty->config variable to know when the CLI
user is in the configuration mode or not. This is much simpler
than obtaining this information from the vty node, and also a more
robust solution (the three switch statements below, for example,
were out of sync).

Also, fix a bug where vty->config wasn't being unset in the
vty_config_exit() function (bug introduced by commit f344c66ea3).

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2019-01-18 23:23:45 -02:00
parent 41e195d477
commit cf09d3ca45
2 changed files with 6 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/command.c
View File

@ -1535,63 +1535,9 @@ DEFUN (config_end,
"end", "end",
"End current mode and change to enable mode.\n") "End current mode and change to enable mode.\n")
{ {
switch (vty->node) { if (vty->config) {
case VIEW_NODE:
case ENABLE_NODE:
/* Nothing to do. */
break;
case CONFIG_NODE:
case INTERFACE_NODE:
case PW_NODE:
case LOGICALROUTER_NODE:
case VRF_NODE:
case NH_GROUP_NODE:
case ZEBRA_NODE:
case RIP_NODE:
case RIPNG_NODE:
case EIGRP_NODE:
case BABEL_NODE:
case BGP_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_VPNV4_NODE:
case BGP_VPNV6_NODE:
case BGP_FLOWSPECV4_NODE:
case BGP_FLOWSPECV6_NODE:
case BGP_IPV4_NODE:
case BGP_IPV4M_NODE:
case BGP_IPV4L_NODE:
case BGP_IPV6_NODE:
case BGP_IPV6M_NODE:
case BGP_EVPN_NODE:
case BGP_EVPN_VNI_NODE:
case BGP_IPV6L_NODE:
case RMAP_NODE:
case PBRMAP_NODE:
case OSPF_NODE:
case OSPF6_NODE:
case LDP_NODE:
case LDP_IPV4_NODE:
case LDP_IPV6_NODE:
case LDP_IPV4_IFACE_NODE:
case LDP_IPV6_IFACE_NODE:
case LDP_L2VPN_NODE:
case LDP_PSEUDOWIRE_NODE:
case ISIS_NODE:
case OPENFABRIC_NODE:
case KEYCHAIN_NODE:
case KEYCHAIN_KEY_NODE:
case VTY_NODE:
case LINK_PARAMS_NODE:
case BFD_NODE:
case BFD_PEER_NODE:
vty_config_exit(vty); vty_config_exit(vty);
vty->node = ENABLE_NODE; vty->node = ENABLE_NODE;
break;
default:
break;
} }
return CMD_SUCCESS; return CMD_SUCCESS;

89
lib/vty.c
View File

@ -775,57 +775,9 @@ static void vty_end_config(struct vty *vty)
{ {
vty_out(vty, "\n"); vty_out(vty, "\n");
switch (vty->node) { if (vty->config) {
case VIEW_NODE:
case ENABLE_NODE:
/* Nothing to do. */
break;
case CONFIG_NODE:
case INTERFACE_NODE:
case PW_NODE:
case ZEBRA_NODE:
case RIP_NODE:
case RIPNG_NODE:
case EIGRP_NODE:
case BGP_NODE:
case BGP_VPNV4_NODE:
case BGP_VPNV6_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_IPV4_NODE:
case BGP_IPV4M_NODE:
case BGP_IPV4L_NODE:
case BGP_IPV6_NODE:
case BGP_IPV6M_NODE:
case BGP_EVPN_NODE:
case BGP_IPV6L_NODE:
case RMAP_NODE:
case PBRMAP_NODE:
case OSPF_NODE:
case OSPF6_NODE:
case LDP_NODE:
case LDP_IPV4_NODE:
case LDP_IPV6_NODE:
case LDP_IPV4_IFACE_NODE:
case LDP_IPV6_IFACE_NODE:
case LDP_L2VPN_NODE:
case LDP_PSEUDOWIRE_NODE:
case ISIS_NODE:
case OPENFABRIC_NODE:
case KEYCHAIN_NODE:
case KEYCHAIN_KEY_NODE:
case VTY_NODE:
case BGP_EVPN_VNI_NODE:
case BFD_NODE:
case BFD_PEER_NODE:
vty_config_exit(vty); vty_config_exit(vty);
vty->node = ENABLE_NODE; vty->node = ENABLE_NODE;
break;
default:
/* Unknown node, we have to ignore it. */
break;
} }
vty_prompt(vty); vty_prompt(vty);
@ -1188,44 +1140,11 @@ static void vty_stop_input(struct vty *vty)
vty_clear_buf(vty); vty_clear_buf(vty);
vty_out(vty, "\n"); vty_out(vty, "\n");
switch (vty->node) { if (vty->config) {
case VIEW_NODE:
case ENABLE_NODE:
/* Nothing to do. */
break;
case CONFIG_NODE:
case INTERFACE_NODE:
case PW_NODE:
case ZEBRA_NODE:
case RIP_NODE:
case RIPNG_NODE:
case EIGRP_NODE:
case BGP_NODE:
case RMAP_NODE:
case PBRMAP_NODE:
case OSPF_NODE:
case OSPF6_NODE:
case LDP_NODE:
case LDP_IPV4_NODE:
case LDP_IPV6_NODE:
case LDP_IPV4_IFACE_NODE:
case LDP_IPV6_IFACE_NODE:
case LDP_L2VPN_NODE:
case LDP_PSEUDOWIRE_NODE:
case ISIS_NODE:
case OPENFABRIC_NODE:
case KEYCHAIN_NODE:
case KEYCHAIN_KEY_NODE:
case VTY_NODE:
case BFD_NODE:
case BFD_PEER_NODE:
vty_config_exit(vty); vty_config_exit(vty);
vty->node = ENABLE_NODE; vty->node = ENABLE_NODE;
break;
default:
/* Unknown node, we have to ignore it. */
break;
} }
vty_prompt(vty); vty_prompt(vty);
/* Set history pointer to the latest one. */ /* Set history pointer to the latest one. */
@ -2732,6 +2651,8 @@ void vty_config_exit(struct vty *vty)
nb_config_free(vty->candidate_config_base); nb_config_free(vty->candidate_config_base);
vty->candidate_config_base = NULL; vty->candidate_config_base = NULL;
} }
vty->config = false;
} }
int vty_config_exclusive_lock(struct vty *vty) int vty_config_exclusive_lock(struct vty *vty)