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

Merge branch 'frr/pull/157' ("Fixinator")

Browse Source 
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-02-07 16:38:03 +01:00
commit ace5a8a17e
3 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_vty.c
View File

@ -6068,7 +6068,7 @@ DEFUN (address_family_ipv4,
DEFUN (address_family_ipv4_safi, DEFUN (address_family_ipv4_safi,
address_family_ipv4_safi_cmd, address_family_ipv4_safi_cmd,
"address-family ipv4 "BGP_SAFI_CMD_STR, "address-family ipv4 (unicast|multicast|vpn|encap)",
"Enter Address Family command mode\n" "Enter Address Family command mode\n"
"Address Family\n" "Address Family\n"
BGP_SAFI_HELP_STR) BGP_SAFI_HELP_STR)
@ -6105,7 +6105,7 @@ DEFUN (address_family_ipv6,
DEFUN (address_family_ipv6_safi, DEFUN (address_family_ipv6_safi,
address_family_ipv6_safi_cmd, address_family_ipv6_safi_cmd,
"address-family ipv6 "BGP_SAFI_CMD_STR, "address-family ipv6 (unicast|multicast|vpn|encap)",
"Enter Address Family command mode\n" "Enter Address Family command mode\n"
"Address Family\n" "Address Family\n"
BGP_SAFI_HELP_STR) BGP_SAFI_HELP_STR)

4
vtysh/extract.pl.in
View File

@ -53,9 +53,9 @@ $ignore{'"router bgp " "<1-4294967295>" " (view|vrf) WORD"'} = "ignore";
$ignore{'"router isis WORD"'} = "ignore"; $ignore{'"router isis WORD"'} = "ignore";
$ignore{'"router zebra"'} = "ignore"; $ignore{'"router zebra"'} = "ignore";
$ignore{'"address-family ipv4"'} = "ignore"; $ignore{'"address-family ipv4"'} = "ignore";
$ignore{'"address-family ipv4 (unicast|multicast)"'} = "ignore"; $ignore{'"address-family ipv4 (unicast|multicast|vpn|encap)"'} = "ignore";
$ignore{'"address-family ipv6"'} = "ignore"; $ignore{'"address-family ipv6"'} = "ignore";
$ignore{'"address-family ipv6 (unicast|multicast)"'} = "ignore"; $ignore{'"address-family ipv6 (unicast|multicast|vpn|encap)"'} = "ignore";
$ignore{'"address-family ipv4 vpn"'} = "ignore"; $ignore{'"address-family ipv4 vpn"'} = "ignore";
$ignore{'"address-family vpnv4"'} = "ignore"; $ignore{'"address-family vpnv4"'} = "ignore";
$ignore{'"address-family vpnv4 unicast"'} = "ignore"; $ignore{'"address-family vpnv4 unicast"'} = "ignore";

55
vtysh/vtysh.c
View File

@ -1215,6 +1215,31 @@ DEFUNSH (VTYSH_BGPD,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUNSH (VTYSH_BGPD,
address_family_ipv4_encap,
address_family_ipv4_encap_cmd,
"address-family ipv4 encap",
"Enter Address Family command mode\n"
"Address family\n"
"Address Family Modifier\n")
{
vty->node = BGP_ENCAP_NODE;
return CMD_SUCCESS;
}
DEFUNSH (VTYSH_BGPD,
address_family_ipv4_vpn,
address_family_ipv4_vpn_cmd,
"address-family ipv4 vpn",
"Enter Address Family command mode\n"
"Address family\n"
"Address Family Modifier\n")
{
vty->node = BGP_VPNV4_NODE;
return CMD_SUCCESS;
}
DEFUNSH (VTYSH_BGPD, DEFUNSH (VTYSH_BGPD,
address_family_ipv6, address_family_ipv6,
address_family_ipv6_cmd, address_family_ipv6_cmd,
@ -1250,6 +1275,30 @@ DEFUNSH (VTYSH_BGPD,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUNSH (VTYSH_BGPD,
address_family_ipv6_encap,
address_family_ipv6_encap_cmd,
"address-family ipv6 encap",
"Enter Address Family command mode\n"
"Address family\n"
"Address Family Modifier\n")
{
vty->node = BGP_ENCAPV6_NODE;
return CMD_SUCCESS;
}
DEFUNSH (VTYSH_BGPD,
address_family_ipv6_vpn,
address_family_ipv6_vpn_cmd,
"address-family ipv6 vpn",
"Enter Address Family command mode\n"
"Address family\n"
"Address Family Modifier\n")
{
vty->node = BGP_VPNV6_NODE;
return CMD_SUCCESS;
}
#if defined (ENABLE_BGP_VNC) #if defined (ENABLE_BGP_VNC)
DEFUNSH (VTYSH_BGPD, DEFUNSH (VTYSH_BGPD,
vnc_defaults, vnc_defaults,
@ -3373,11 +3422,13 @@ vtysh_init_vty (void)
#endif #endif
install_element (BGP_NODE, &address_family_ipv4_unicast_cmd); install_element (BGP_NODE, &address_family_ipv4_unicast_cmd);
install_element (BGP_NODE, &address_family_ipv4_multicast_cmd); install_element (BGP_NODE, &address_family_ipv4_multicast_cmd);
#ifdef HAVE_IPV6 install_element (BGP_NODE, &address_family_ipv4_encap_cmd);
install_element (BGP_NODE, &address_family_ipv4_vpn_cmd);
install_element (BGP_NODE, &address_family_ipv6_cmd); install_element (BGP_NODE, &address_family_ipv6_cmd);
install_element (BGP_NODE, &address_family_ipv6_unicast_cmd); install_element (BGP_NODE, &address_family_ipv6_unicast_cmd);
install_element (BGP_NODE, &address_family_ipv6_multicast_cmd); install_element (BGP_NODE, &address_family_ipv6_multicast_cmd);
#endif install_element (BGP_NODE, &address_family_ipv6_encap_cmd);
install_element (BGP_NODE, &address_family_ipv6_vpn_cmd);
install_element (BGP_VPNV4_NODE, &exit_address_family_cmd); install_element (BGP_VPNV4_NODE, &exit_address_family_cmd);
install_element (BGP_VPNV6_NODE, &exit_address_family_cmd); install_element (BGP_VPNV6_NODE, &exit_address_family_cmd);
install_element (BGP_ENCAP_NODE, &exit_address_family_cmd); install_element (BGP_ENCAP_NODE, &exit_address_family_cmd);