diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2024-04-03 08:36:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-03 08:36:31 -0400 |
| commit | 3d66dd3e861e84c5812fca82a4704e483c992f2c (patch) | |
| tree | e01f9a8180a3a5ca1e3ea206438626d652ef28ca | |
| parent | 27cc9ae508ad11107a3d9c446838870433d1f503 (diff) | |
| parent | 59571fd14bdd10556aa1dc4a2201e912fed63cf2 (diff) | |
Merge pull request #15618 from opensourcerouting/fix/bgp_optimize_suppress_path
bgpd: Optimize the path for suppressed announcements
| -rw-r--r-- | bgpd/bgp_updgrp_adv.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c index 989dbe43a3..5d7a8b2ba1 100644 --- a/bgpd/bgp_updgrp_adv.c +++ b/bgpd/bgp_updgrp_adv.c @@ -532,7 +532,7 @@ bool bgp_adj_out_set_subgroup(struct bgp_dest *dest, struct peer *adv_peer; struct peer_af *paf; struct bgp *bgp; - uint32_t attr_hash = attrhash_key_make(attr); + uint32_t attr_hash = 0; peer = SUBGRP_PEER(subgrp); afi = SUBGRP_AFI(subgrp); @@ -567,9 +567,11 @@ bool bgp_adj_out_set_subgroup(struct bgp_dest *dest, * the route wasn't changed actually. * Do not suppress BGP UPDATES for route-refresh. */ - if (CHECK_FLAG(bgp->flags, BGP_FLAG_SUPPRESS_DUPLICATES) - && !CHECK_FLAG(subgrp->sflags, SUBGRP_STATUS_FORCE_UPDATES) - && adj->attr_hash == attr_hash) { + if (likely(CHECK_FLAG(bgp->flags, BGP_FLAG_SUPPRESS_DUPLICATES))) + attr_hash = attrhash_key_make(attr); + + if (!CHECK_FLAG(subgrp->sflags, SUBGRP_STATUS_FORCE_UPDATES) && + attr_hash && adj->attr_hash == attr_hash) { if (BGP_DEBUG(update, UPDATE_OUT)) { char attr_str[BUFSIZ] = {0}; |