summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2021-01-08 17:34:37 -0500
committerGitHub <noreply@github.com>2021-01-08 17:34:37 -0500
commitebaf5fe92d617eb04dd5d187568c99f34a7f4a1a (patch)
tree18006c7acf20dc87091ea060179df640deedbeee
parent9932aa1200cdef5eddeec7bd184796616db84b04 (diff)
parent8b56739eb4597cba27425254db410ec71c6914f3 (diff)
Merge pull request #7838 from ton31337/fix/force_updates_on_reset_out
bgpd: Force BGP updates when triggering reset out
-rw-r--r--bgpd/bgpd.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index b6afa391f3..2149b14585 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3990,6 +3990,8 @@ bool peer_active_nego(struct peer *peer)
void peer_change_action(struct peer *peer, afi_t afi, safi_t safi,
enum peer_change_type type)
{
+ struct peer_af *paf;
+
if (CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP))
return;
@@ -4022,7 +4024,12 @@ void peer_change_action(struct peer *peer, afi_t afi, safi_t safi,
BGP_NOTIFY_CEASE_CONFIG_CHANGE);
}
} else if (type == peer_change_reset_out) {
- update_group_adjust_peer(peer_af_find(peer, afi, safi));
+ paf = peer_af_find(peer, afi, safi);
+ if (paf && paf->subgroup)
+ SET_FLAG(paf->subgroup->sflags,
+ SUBGRP_STATUS_FORCE_UPDATES);
+
+ update_group_adjust_peer(paf);
bgp_announce_route(peer, afi, safi);
}
}