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

Merge pull request #3162 from pguibert6WIND/vpn_route_map_issue

Browse Source 
bgpd: vpn route-map config should be kept, except if vrf list is on
This commit is contained in:
Renato Westphal 2018-11-03 15:20:20 -03:00 committed by GitHub
commit 8dfa7e4680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bgpd/bgp_vty.c
View File

@ -12352,11 +12352,16 @@ void bgp_vpn_policy_config_write_afi(struct vty *vty, struct bgp *bgp,
{ {
int indent = 2; int indent = 2;
if (bgp->vpn_policy[afi].rmap_name[BGP_VPN_POLICY_DIR_FROMVPN]) if (bgp->vpn_policy[afi].rmap_name[BGP_VPN_POLICY_DIR_FROMVPN]) {
vty_out(vty, "%*simport vrf route-map %s\n", indent, "", if (listcount(bgp->vpn_policy[afi].import_vrf))
bgp->vpn_policy[afi] vty_out(vty, "%*simport vrf route-map %s\n", indent, "",
bgp->vpn_policy[afi]
.rmap_name[BGP_VPN_POLICY_DIR_FROMVPN]); .rmap_name[BGP_VPN_POLICY_DIR_FROMVPN]);
else
vty_out(vty, "%*sroute-map vpn import %s\n", indent, "",
bgp->vpn_policy[afi]
.rmap_name[BGP_VPN_POLICY_DIR_FROMVPN]);
}
if (CHECK_FLAG(bgp->af_flags[afi][SAFI_UNICAST], if (CHECK_FLAG(bgp->af_flags[afi][SAFI_UNICAST],
BGP_CONFIG_VRF_TO_VRF_IMPORT) BGP_CONFIG_VRF_TO_VRF_IMPORT)
|| CHECK_FLAG(bgp->af_flags[afi][SAFI_UNICAST], || CHECK_FLAG(bgp->af_flags[afi][SAFI_UNICAST],