proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 17:40:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib, vtysh: Add bits and pieces to allow vtysh to understand babel

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-05-13 23:38:14 -04:00
parent 053d05608f
commit a616ea5f24
4 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/command.c
View File

@ -1402,6 +1402,7 @@ cmd_exit (struct vty *vty)
case BGP_NODE:
case RIP_NODE:
case EIGRP_NODE:
case BABEL_NODE:
case RIPNG_NODE:
case OSPF_NODE:
case OSPF6_NODE:
@ -1486,6 +1487,7 @@ DEFUN (config_end,
case RIP_NODE:
case RIPNG_NODE:
case EIGRP_NODE:
case BABEL_NODE:
case BGP_NODE:
case BGP_ENCAP_NODE:
case BGP_ENCAPV6_NODE:

6
vtysh/extract.pl.in
View File

@ -85,7 +85,7 @@ foreach (@ARGV) {
$protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_EIGRPD";
}
elsif ($file =~ /lib\/vrf\.c$/) {
$protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_EIGRPD";
$protocol = "VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_EIGRPD|VTYSH_BABELD";
}
elsif ($file =~ /lib\/filter\.c$/) {
$protocol = "VTYSH_ALL";
@ -98,9 +98,9 @@ foreach (@ARGV) {
}
elsif ($file =~ /lib\/plist\.c$/) {
if ($defun_array[1] =~ m/ipv6/) {
$protocol = "VTYSH_RIPNGD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA";
$protocol = "VTYSH_RIPNGD|VTYSH_OSPF6D|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_BABELD";
} else {
$protocol = "VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_EIGRPD";
$protocol = "VTYSH_RIPD|VTYSH_OSPFD|VTYSH_BGPD|VTYSH_ZEBRA|VTYSH_PIMD|VTYSH_EIGRPD|VTYSH_BABELD";
}
}
elsif ($file =~ /lib\/distribute\.c$/) {

42
vtysh/vtysh.c
View File

@ -1014,6 +1014,12 @@ static struct cmd_node eigrp_node =
"%s(config-router)# "
};
static struct cmd_node babel_node =
{
BABEL_NODE,
"%s(config-router)# "
};
static struct cmd_node ripng_node =
{
RIPNG_NODE,
@ -1404,6 +1410,17 @@ DEFUNSH (VTYSH_EIGRPD,
return CMD_SUCCESS;
}
DEFUNSH (VTYSH_BABELD,
router_babel,
router_babel_cmd,
"router babel",
"Enable a routing process\n"
"Make Babel instance command\n")
{
vty->node = BABEL_NODE;
return CMD_SUCCESS;
}
DEFUNSH (VTYSH_OSPF6D,
router_ospf6,
router_ospf6_cmd,
@ -1588,6 +1605,7 @@ vtysh_exit (struct vty *vty)
case OSPF_NODE:
case OSPF6_NODE:
case EIGRP_NODE:
case BABEL_NODE:
case LDP_NODE:
case LDP_L2VPN_NODE:
case ISIS_NODE:
@ -1811,6 +1829,24 @@ DEFUNSH (VTYSH_EIGRPD,
return vtysh_exit (vty);
}
DEFUNSH (VTYSH_EIGRPD,
vtysh_exit_babeld,
vtysh_exit_babeld_cmd,
"exit",
"Exit current mode and down to previous mode\n")
{
return vtysh_exit (vty);
}
DEFUNSH (VTYSH_BABELD,
vtysh_quit_babeld,
vtysh_quit_babeld_cmd,
"quit",
"Exit current mode and down to previous mode\n")
{
return vtysh_exit (vty);
}
DEFUNSH (VTYSH_OSPF6D,
vtysh_exit_ospf6d,
vtysh_exit_ospf6d_cmd,
@ -3230,6 +3266,7 @@ vtysh_init_vty (void)
install_node (&bgp_vnc_l2_group_node, NULL);
install_node (&ospf_node, NULL);
install_node (&eigrp_node, NULL);
install_node (&babel_node, NULL);
install_node (&ripng_node, NULL);
install_node (&ospf6_node, NULL);
install_node (&ldp_node, NULL);
@ -3273,6 +3310,7 @@ vtysh_init_vty (void)
#endif
vtysh_install_default (OSPF_NODE);
vtysh_install_default (EIGRP_NODE);
vtysh_install_default (BABEL_NODE);
vtysh_install_default (RIPNG_NODE);
vtysh_install_default (OSPF6_NODE);
vtysh_install_default (LDP_NODE);
@ -3304,6 +3342,8 @@ vtysh_init_vty (void)
install_element (OSPF_NODE, &vtysh_quit_ospfd_cmd);
install_element (EIGRP_NODE, &vtysh_exit_eigrpd_cmd);
install_element (EIGRP_NODE, &vtysh_quit_eigrpd_cmd);
install_element (BABEL_NODE, &vtysh_exit_babeld_cmd);
install_element (BABEL_NODE, &vtysh_quit_babeld_cmd);
install_element (OSPF6_NODE, &vtysh_exit_ospf6d_cmd);
install_element (OSPF6_NODE, &vtysh_quit_ospf6d_cmd);
#if defined (HAVE_LDPD)
@ -3373,6 +3413,7 @@ vtysh_init_vty (void)
install_element (RIPNG_NODE, &vtysh_end_all_cmd);
install_element (OSPF_NODE, &vtysh_end_all_cmd);
install_element (EIGRP_NODE, &vtysh_end_all_cmd);
install_element (BABEL_NODE, &vtysh_end_all_cmd);
install_element (OSPF6_NODE, &vtysh_end_all_cmd);
install_element (LDP_NODE, &vtysh_end_all_cmd);
install_element (LDP_IPV4_NODE, &vtysh_end_all_cmd);
@ -3423,6 +3464,7 @@ vtysh_init_vty (void)
install_element (VRF_NODE, &vtysh_quit_vrf_cmd);
install_element (CONFIG_NODE, &router_eigrp_cmd);
install_element (CONFIG_NODE, &router_babel_cmd);
install_element (CONFIG_NODE, &router_rip_cmd);
install_element (CONFIG_NODE, &router_ripng_cmd);
install_element (CONFIG_NODE, &router_ospf_cmd);

2
vtysh/vtysh_config.c
View File

@ -208,6 +208,8 @@ vtysh_config_parse_line (const char *line)
config = config_get (RIPNG_NODE, line);
else if (strncmp (line, "router eigrp", strlen ("router eigrp")) == 0)
config = config_get (EIGRP_NODE, line);
else if (strncmp (line, "router babel", strlen ("router babel")) == 0)
config = config_get (BABEL_NODE, line);
else if (strncmp (line, "router ospf", strlen ("router ospf")) == 0)
config = config_get (OSPF_NODE, line);
else if (strncmp (line, "router ospf6", strlen ("router ospf6")) == 0)