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

bgpd: fix 'no nexthop vpn export'

Browse Source 
ALIAS without parameters against DEFPY w/ required parameters doesn't
work

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2020-03-09 14:55:37 -04:00
parent 5cb1323595
commit 8c85ca283b
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bgpd/bgp_vty.c
View File

@ -7304,7 +7304,7 @@ ALIAS (af_label_vpn_export,
DEFPY (af_nexthop_vpn_export, DEFPY (af_nexthop_vpn_export,
af_nexthop_vpn_export_cmd, af_nexthop_vpn_export_cmd,
"[no] nexthop vpn export <A.B.C.D|X:X::X:X>$nexthop_str", "[no] nexthop vpn export [<A.B.C.D|X:X::X:X>$nexthop_su]",
NO_STR NO_STR
"Specify next hop to use for VRF advertised prefixes\n" "Specify next hop to use for VRF advertised prefixes\n"
"Between current address-family and vpn\n" "Between current address-family and vpn\n"
@ -7315,14 +7315,14 @@ DEFPY (af_nexthop_vpn_export,
VTY_DECLVAR_CONTEXT(bgp, bgp); VTY_DECLVAR_CONTEXT(bgp, bgp);
afi_t afi; afi_t afi;
struct prefix p; struct prefix p;
int idx = 0;
int yes = 1;
if (argv_find(argv, argc, "no", &idx)) if (!no) {
yes = 0; if (!nexthop_su) {
vty_out(vty, "%% Nexthop required\n");
return CMD_WARNING_CONFIG_FAILED;
}
if (yes) { if (!sockunion2hostprefix(nexthop_su, &p))
if (!sockunion2hostprefix(nexthop_str, &p))
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
@ -7336,7 +7336,7 @@ DEFPY (af_nexthop_vpn_export,
vpn_leak_prechange(BGP_VPN_POLICY_DIR_TOVPN, afi, vpn_leak_prechange(BGP_VPN_POLICY_DIR_TOVPN, afi,
bgp_get_default(), bgp); bgp_get_default(), bgp);
if (yes) { if (!no) {
bgp->vpn_policy[afi].tovpn_nexthop = p; bgp->vpn_policy[afi].tovpn_nexthop = p;
SET_FLAG(bgp->vpn_policy[afi].flags, SET_FLAG(bgp->vpn_policy[afi].flags,
BGP_VPN_POLICY_TOVPN_NEXTHOP_SET); BGP_VPN_POLICY_TOVPN_NEXTHOP_SET);
@ -7352,14 +7352,6 @@ DEFPY (af_nexthop_vpn_export,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS (af_nexthop_vpn_export,
af_no_nexthop_vpn_export_cmd,
"no nexthop vpn export",
NO_STR
"Specify next hop to use for VRF advertised prefixes\n"
"Between current address-family and vpn\n"
"For routes leaked from current address-family to vpn\n")
static int vpn_policy_getdirs(struct vty *vty, const char *dstr, int *dodir) static int vpn_policy_getdirs(struct vty *vty, const char *dstr, int *dodir)
{ {
if (!strcmp(dstr, "import")) { if (!strcmp(dstr, "import")) {
@ -16613,8 +16605,6 @@ void bgp_vty_init(void)
install_element(BGP_IPV6_NODE, &af_no_rd_vpn_export_cmd); install_element(BGP_IPV6_NODE, &af_no_rd_vpn_export_cmd);
install_element(BGP_IPV4_NODE, &af_no_label_vpn_export_cmd); install_element(BGP_IPV4_NODE, &af_no_label_vpn_export_cmd);
install_element(BGP_IPV6_NODE, &af_no_label_vpn_export_cmd); install_element(BGP_IPV6_NODE, &af_no_label_vpn_export_cmd);
install_element(BGP_IPV4_NODE, &af_no_nexthop_vpn_export_cmd);
install_element(BGP_IPV6_NODE, &af_no_nexthop_vpn_export_cmd);
install_element(BGP_IPV4_NODE, &af_no_rt_vpn_imexport_cmd); install_element(BGP_IPV4_NODE, &af_no_rt_vpn_imexport_cmd);
install_element(BGP_IPV6_NODE, &af_no_rt_vpn_imexport_cmd); install_element(BGP_IPV6_NODE, &af_no_rt_vpn_imexport_cmd);
install_element(BGP_IPV4_NODE, &af_no_route_map_vpn_imexport_cmd); install_element(BGP_IPV4_NODE, &af_no_route_map_vpn_imexport_cmd);