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

lib: handle exit cmd for bgp afi-safi nodes

Browse Source 
In transactional cli mode, bgp address-family <afi> <afi>
node builds xpath on top of `router bgp` node's xpath.
When `exit` is applied under afi-safi commands, retain
xpath_index to 1 to keep using bgp global xpath.

Signed-off-by: Chirag Shah <chirag@nvidia.com>
This commit is contained in:
Chirag Shah 2020-08-27 12:49:45 -07:00
parent 3b66fcef58
commit dd90823b1d
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/command.c
View File

@ -139,6 +139,27 @@ static struct cmd_node config_node = {
.node_exit = vty_config_node_exit,
};
static bool vty_check_node_for_xpath_decrement(enum node_type target_node,
enum node_type node)
{
/* bgp afi-safi (`address-family <afi> <safi>`) node
* does not increment xpath_index.
* In order to use (`router bgp`) BGP_NODE's xpath as a base,
* retain xpath_index as 1 upon exiting from
* afi-safi node.
*/
if (target_node == BGP_NODE
&& (node == BGP_IPV4_NODE || node == BGP_IPV6_NODE
|| node == BGP_IPV4M_NODE || node == BGP_IPV6M_NODE
|| node == BGP_VPNV4_NODE || node == BGP_VPNV6_NODE
|| node == BGP_EVPN_NODE || node == BGP_IPV4L_NODE
|| node == BGP_IPV6L_NODE ))
return false;
return true;
}
/* This is called from main when a daemon is invoked with -v or --version. */
void print_version(const char *progname)
{
@ -985,7 +1006,9 @@ int cmd_execute_command(vector vline, struct vty *vty,
while (vty->node > CONFIG_NODE) {
try_node = node_parent(try_node);
vty->node = try_node;
if (vty->xpath_index > 0)
if (vty->xpath_index > 0
&& vty_check_node_for_xpath_decrement(try_node,
onode))
vty->xpath_index--;
ret = cmd_execute_command_real(vline, FILTER_RELAXED,
vty, cmd);
@ -1194,7 +1217,9 @@ int command_config_read_one_line(struct vty *vty,
&& ret != CMD_SUCCESS && ret != CMD_WARNING
&& vty->node > CONFIG_NODE) {
vty->node = node_parent(vty->node);
if (vty->xpath_index > 0)
if (vty->xpath_index > 0
&& vty_check_node_for_xpath_decrement(vty->node,
saved_node))
vty->xpath_index--;
ret = cmd_execute_command_strict(vline, vty, cmd);
}
@ -1316,7 +1341,8 @@ void cmd_exit(struct vty *vty)
}
if (cnode->parent_node)
vty->node = cnode->parent_node;
if (vty->xpath_index > 0)
if (vty->xpath_index > 0
&& vty_check_node_for_xpath_decrement(vty->node, cnode->node))
vty->xpath_index--;
}