Commit 5a17849aa0 for frr
commit 5a17849aa0a3cb5ab9b7e20c91f797a50ed4e1b9
Author: Donald Sharp <sharpd@nvidia.com>
Date: Thu Nov 12 10:45:23 2026 -0500
bgpd: add accessors for the EVPN DF preference
Add bgp_attr_get_df_pref() and bgp_attr_set_df_pref() and use them
for every read and write of the designated-forwarder preference
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 4d12f28375..9c7769c1fd 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, bgp_attr_get_df_alg(attr), attr->df_pref);
+ MIX3(attr->mm_seqnum, bgp_attr_get_df_alg(attr), bgp_attr_get_df_pref(attr));
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,7 @@ 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 &&
+ bgp_attr_get_df_pref(attr1) == bgp_attr_get_df_pref(attr2) &&
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 &&
@@ -3526,7 +3526,7 @@ 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, &df_alg);
+ bgp_attr_set_df_pref(attr, bgp_attr_df_pref_from_ec(attr, &df_alg));
bgp_attr_set_df_alg(attr, df_alg);
/* Extract MAC mobility sequence number, if any. */
diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
index 0db0917c6a..8962fb419e 100644
--- a/bgpd/bgp_attr.h
+++ b/bgpd/bgp_attr.h
@@ -870,6 +870,16 @@ static inline void bgp_attr_set_evpn_flags(struct attr *attr, uint8_t evpn_flags
attr->evpn_flags = evpn_flags;
}
+static inline uint16_t bgp_attr_get_df_pref(const struct attr *attr)
+{
+ return attr->df_pref;
+}
+
+static inline void bgp_attr_set_df_pref(struct attr *attr, uint16_t df_pref)
+{
+ attr->df_pref = df_pref;
+}
+
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 72edc3e8f3..3ae1ea0104 100644
--- a/bgpd/bgp_evpn_mh.c
+++ b/bgpd/bgp_evpn_mh.c
@@ -191,7 +191,7 @@ 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*/,
bgp_attr_get_df_alg(old_select->attr),
- old_select->attr->df_pref, &zret);
+ bgp_attr_get_df_pref(old_select->attr), &zret);
}
UNSET_FLAG(old_select->flags, BGP_PATH_MULTIPATH_CHG);
bgp_zebra_clear_route_change_flags(dest);
@@ -223,7 +223,7 @@ static int bgp_evpn_es_route_select_install(struct bgp *bgp,
bgp_evpn_mh_get_vtep_ip(new_select->attr, &vtep_ip);
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);
+ bgp_attr_get_df_pref(new_select->attr), &zret);
} else {
if (old_select && old_select->type == ZEBRA_ROUTE_BGP &&
old_select->sub_type == BGP_ROUTE_IMPORTED) {