proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-01 12:47:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: fix problem with SVI IP being advertised even if disabled

Browse Source 
SVI IP is being advertised unconditionally i.e. even if disabled (and
that is the default config). This can be problematic when the SVI address
is re-used across racks.

Added the user config condition in all the relevant places where the
SVI advertisement is triggered.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
This commit is contained in:
Anuradha Karuppiah 2020-11-03 14:34:46 -08:00 committed by Anuradha Karuppiah
parent dc86ef74e6
commit c0c7707d0d
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zebra/zebra_evpn.c
View File

@ -151,6 +151,9 @@ void zebra_evpn_print(zebra_evpn_t *zevpn, void **ctxt)
buf, sizeof(buf)));
json_object_string_add(json, "advertiseGatewayMacip",
zevpn->advertise_gw_macip ? "Yes" : "No");
json_object_string_add(json, "advertiseSviMacip",
zevpn->advertise_svi_macip ? "Yes"
: "No");
json_object_int_add(json, "numMacs", num_macs);
json_object_int_add(json, "numArpNd", num_neigh);
}
@ -194,6 +197,8 @@ void zebra_evpn_print(zebra_evpn_t *zevpn, void **ctxt)
num_neigh);
vty_out(vty, " Advertise-gw-macip: %s\n",
zevpn->advertise_gw_macip ? "Yes" : "No");
vty_out(vty, " Advertise-svi-macip: %s\n",
zevpn->advertise_svi_macip ? "Yes" : "No");
}
}
@ -569,7 +574,9 @@ void zebra_evpn_gw_macip_add_for_evpn_hash(struct hash_bucket *bucket,
return;
/* Add primary SVI MAC-IP */
zebra_evpn_add_macip_for_intf(vlan_if, zevpn);
if (advertise_svi_macip_enabled(zevpn)
|| advertise_gw_macip_enabled(zevpn))
zebra_evpn_add_macip_for_intf(vlan_if, zevpn);
if (advertise_gw_macip_enabled(zevpn)) {
/* Add VRR MAC-IP - if any*/
@ -927,12 +934,16 @@ void zebra_evpn_read_mac_neigh(zebra_evpn_t *zevpn, struct interface *ifp)
if (vlan_if) {
/* Add SVI MAC-IP */
zebra_evpn_add_macip_for_intf(vlan_if, zevpn);
if (advertise_svi_macip_enabled(zevpn)
|| advertise_gw_macip_enabled(zevpn))
zebra_evpn_add_macip_for_intf(vlan_if, zevpn);
/* Add VRR MAC-IP - if any*/
vrr_if = zebra_get_vrr_intf_for_svi(vlan_if);
if (vrr_if)
zebra_evpn_add_macip_for_intf(vrr_if, zevpn);
if (advertise_gw_macip_enabled(zevpn)) {
vrr_if = zebra_get_vrr_intf_for_svi(vlan_if);
if (vrr_if)
zebra_evpn_add_macip_for_intf(vrr_if, zevpn);
}
neigh_read_for_vlan(zns, vlan_if);
}

10
zebra/zebra_vxlan.c
View File

@ -4493,6 +4493,16 @@ int zebra_vxlan_add_del_gw_macip(struct interface *ifp, struct prefix *p,
return -1;
}
/* VRR IP is advertised only if gw-macip-adv-enabled */
if (IS_ZEBRA_IF_MACVLAN(ifp)) {
if (!advertise_gw_macip_enabled(zevpn))
return 0;
} else {
/* SVI IP is advertised if gw or svi macip-adv-enabled */
if (!advertise_svi_macip_enabled(zevpn)
&& !advertise_gw_macip_enabled(zevpn))
return 0;
}
memcpy(&macaddr.octet, ifp->hw_addr, ETH_ALEN);