Commit bcaa2f1614 for frr
commit bcaa2f1614c93abcbd6658eb6e13bd69db2ee612
Author: Donald Sharp <sharpd@nvidia.com>
Date: Thu Nov 12 10:41:53 2026 -0500
bgpd: add accessors for the EVPN DF algorithm
Add bgp_attr_get_df_alg() and bgp_attr_set_df_alg() and use them for
every read and write of the designated-forwarder election algorithm
stored on a route attribute.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index b96763c206..3df145f11d 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -1410,7 +1410,7 @@ unsigned int attrhash_key_make(const void *p)
MIX3(attr->nh_ifindex, attr->nh_lla_ifindex, attr->distance);
MIX(attr->bh_type);
MIX(bgp_attr_get_otc(attr));
- MIX3(attr->mm_seqnum, attr->df_alg, attr->df_pref);
+ MIX3(attr->mm_seqnum, bgp_attr_get_df_alg(attr), attr->df_pref);
MIX(attr->encap_tunneltype);
MIX(bgp_attr_get_pmsi_tnl_type(attr));
if (bgp_attr_get_pmsi_tnl_type(attr) == PMSI_TNLTYPE_INGR_REPL)
@@ -1463,7 +1463,8 @@ bool attrhash_cmp(const void *p1, const void *p2)
bgp_attr_get_es_flags(attr1) == bgp_attr_get_es_flags(attr2) &&
attr1->mm_seqnum == attr2->mm_seqnum &&
attr1->mm_sync_seqnum == attr2->mm_sync_seqnum &&
- attr1->df_pref == attr2->df_pref && attr1->df_alg == attr2->df_alg &&
+ attr1->df_pref == attr2->df_pref &&
+ bgp_attr_get_df_alg(attr1) == bgp_attr_get_df_alg(attr2) &&
attr1->nh_ifindex == attr2->nh_ifindex &&
attr1->nh_lla_ifindex == attr2->nh_lla_ifindex &&
attr1->nh_flags == attr2->nh_flags && attr1->distance == attr2->distance &&
@@ -3501,6 +3502,7 @@ bgp_attr_ext_communities(struct bgp_attr_parser_args *args)
bool proxy = false;
struct ecommunity *ecomm;
bgp_encap_types tun_type = BGP_ENCAP_TYPE_VXLAN;/*Default tunnel type*/
+ uint8_t df_alg;
if (length == 0) {
bgp_attr_set_ecommunity(attr, NULL);
@@ -3523,7 +3525,8 @@ bgp_attr_ext_communities(struct bgp_attr_parser_args *args)
args->total);
/* Extract DF election preference and mobility sequence number */
- attr->df_pref = bgp_attr_df_pref_from_ec(attr, &attr->df_alg);
+ attr->df_pref = bgp_attr_df_pref_from_ec(attr, &df_alg);
+ bgp_attr_set_df_alg(attr, df_alg);
/* Extract MAC mobility sequence number, if any. */
attr->mm_seqnum = bgp_attr_mac_mobility_seqnum(attr);
diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
index 326e04cdbd..6bad894f75 100644
--- a/bgpd/bgp_attr.h
+++ b/bgpd/bgp_attr.h
@@ -850,6 +850,16 @@ static inline void bgp_attr_set_es_flags(struct attr *attr, uint8_t es_flags)
attr->es_flags = es_flags;
}
+static inline uint8_t bgp_attr_get_df_alg(const struct attr *attr)
+{
+ return attr->df_alg;
+}
+
+static inline void bgp_attr_set_df_alg(struct attr *attr, uint8_t df_alg)
+{
+ attr->df_alg = df_alg;
+}
+
static inline struct bgp_route_evpn *
bgp_attr_get_evpn_overlay(const struct attr *attr)
{
diff --git a/bgpd/bgp_evpn_mh.c b/bgpd/bgp_evpn_mh.c
index 078c129555..72edc3e8f3 100644
--- a/bgpd/bgp_evpn_mh.c
+++ b/bgpd/bgp_evpn_mh.c
@@ -190,8 +190,8 @@ static int bgp_evpn_es_route_select_install(struct bgp *bgp,
bgp_evpn_mh_get_vtep_ip(old_select->attr, &vtep_ip);
bgp_evpn_es_vtep_add(bgp, es, vtep_ip, true /*esr*/,
- old_select->attr->df_alg, old_select->attr->df_pref,
- &zret);
+ bgp_attr_get_df_alg(old_select->attr),
+ old_select->attr->df_pref, &zret);
}
UNSET_FLAG(old_select->flags, BGP_PATH_MULTIPATH_CHG);
bgp_zebra_clear_route_change_flags(dest);
@@ -221,7 +221,8 @@ static int bgp_evpn_es_route_select_install(struct bgp *bgp,
struct ipaddr vtep_ip = {};
bgp_evpn_mh_get_vtep_ip(new_select->attr, &vtep_ip);
- bgp_evpn_es_vtep_add(bgp, es, vtep_ip, true /*esr */, new_select->attr->df_alg,
+ bgp_evpn_es_vtep_add(bgp, es, vtep_ip, true /*esr */,
+ bgp_attr_get_df_alg(new_select->attr),
new_select->attr->df_pref, &zret);
} else {
if (old_select && old_select->type == ZEBRA_ROUTE_BGP &&