bgpd: Check for L3VNI before sending RMAC/L3 RTs

Ensure that the presence of L3VNI is checked before we generate
Router MAC and L3 Route Target extended communities. Without this
check, the router would send an all-zeros RMAC in some situations,
which may cause problems for receivers.

Ticket: CM-21014
Testing Done:
a) Verification of failed scenario
b) Interop verification by Scott Laffer
c) evpn-smoke

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 73f225784cb903827577b4727a74d9a042732fe8..2cfab2393b2dcee71b389d23c6bb187265e5770c 100644 (file)
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -1736,7 +1736,8 @@ static int update_evpn_route(struct bgp *bgp, struct bgpevpn *vpn,
        if (p->prefix.route_type == BGP_EVPN_MAC_IP_ROUTE &&
            (is_evpn_prefix_ipaddr_v4(p) ||
             !IN6_IS_ADDR_LINKLOCAL(&p->prefix.macip_addr.ip.ipaddr_v6)) &&
-           CHECK_FLAG(vpn->flags, VNI_FLAG_USE_TWO_LABELS))
+           CHECK_FLAG(vpn->flags, VNI_FLAG_USE_TWO_LABELS) &&
+           bgpevpn_get_l3vni(vpn))
                add_l3_ecomm = 1;
 
        /* Set up extended community. */
@@ -1988,7 +1989,8 @@ static int update_all_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)
        /* Add L3 VNI RTs and RMAC for non IPv6 link-local attributes if
         * using L3 VNI for type-2 routes also.
         */
-       if (CHECK_FLAG(vpn->flags, VNI_FLAG_USE_TWO_LABELS))
+       if (CHECK_FLAG(vpn->flags, VNI_FLAG_USE_TWO_LABELS) &&
+           bgpevpn_get_l3vni(vpn))
                add_l3_ecomm = 1;
 
        build_evpn_route_extcomm(vpn, &attr, add_l3_ecomm);