bgpd: fix import of evpn routes into vni/vrf/esi after nexthop update

Related to issue #10271 After an update of the BGP nexthop (e.g. update of the igp metric), the EVPN routes are not updated in VNIs, VRFs and ESIs. Fix the issue. Signed-off-by: Louis Scalbert <[email protected]>
FRRouting · Jan 19, 2022 · 2641ab9 · 2641ab9
1 parent c748ab2
commit 2641ab9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
@@ -2496,8 +2496,11 @@ static int install_evpn_route_entry_in_vrf(struct bgp *bgp_vrf,
 		pi = bgp_create_evpn_bgp_path_info(parent_pi, dest, &attr);
 		new_pi = true;
 	} else {
-		if (attrhash_cmp(pi->attr, &attr)
-		    && !CHECK_FLAG(pi->flags, BGP_PATH_REMOVED)) {
+		if (attrhash_cmp(pi->attr, &attr) &&
+		    ((pi->extra && parent_pi->extra &&
+		      pi->extra->igpmetric == parent_pi->extra->igpmetric) ||
+		     (!pi->extra && !parent_pi->extra)) &&
+		    !CHECK_FLAG(pi->flags, BGP_PATH_REMOVED)) {
 			bgp_dest_unlock_node(dest);
 			return 0;
 		}

diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
@@ -1103,6 +1103,11 @@ void evaluate_paths(struct bgp_nexthop_cache *bnc)
 					bgp_evpn_import_route(bgp_path,
 						afi, safi, bgp_dest_get_prefix(dest), path);
 			}
+		} else if (safi == SAFI_EVPN &&
+			   bgp_evpn_is_prefix_nht_supported(
+				   bgp_dest_get_prefix(dest))) {
+			bgp_evpn_import_route(bgp_path, afi, safi,
+					      bgp_dest_get_prefix(dest), path);
 		}
 
 		bgp_process(bgp_path, dest, afi, safi);