Skip to content

Commit

Permalink
Merge pull request #15013 from opensourcerouting/fix/bdb5ae8bce94432e…
Browse files Browse the repository at this point in the history
…b5e581f04f48dc4aa5db7ca4_9.0

bgpd: Make suppress-fib-pending clear peering
  • Loading branch information
mjstapp authored Dec 13, 2023
2 parents a5bf65d + 66a0a6f commit 2cefe5d
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions bgpd/bgpd.c
Original file line number Diff line number Diff line change
Expand Up @@ -440,12 +440,11 @@ void bm_wait_for_fib_set(bool set)
*/
for (ALL_LIST_ELEMENTS_RO(bm->bgp, next, bgp)) {
for (ALL_LIST_ELEMENTS_RO(bgp->peer, node, peer)) {
if (!BGP_IS_VALID_STATE_FOR_NOTIF(
peer->connection->status))
if (!BGP_IS_VALID_STATE_FOR_NOTIF(peer->status))
continue;

peer->last_reset = PEER_DOWN_SUPPRESS_FIB_PENDING;
bgp_notify_send(peer->connection, BGP_NOTIFY_CEASE,
bgp_notify_send(peer, BGP_NOTIFY_CEASE,
BGP_NOTIFY_CEASE_CONFIG_CHANGE);
}
}
Expand Down Expand Up @@ -496,11 +495,11 @@ void bgp_suppress_fib_pending_set(struct bgp *bgp, bool set)
* let's just start over
*/
for (ALL_LIST_ELEMENTS_RO(bgp->peer, node, peer)) {
if (!BGP_IS_VALID_STATE_FOR_NOTIF(peer->connection->status))
if (!BGP_IS_VALID_STATE_FOR_NOTIF(peer->status))
continue;

peer->last_reset = PEER_DOWN_SUPPRESS_FIB_PENDING;
bgp_notify_send(peer->connection, BGP_NOTIFY_CEASE,
bgp_notify_send(peer, BGP_NOTIFY_CEASE,
BGP_NOTIFY_CEASE_CONFIG_CHANGE);
}
}
Expand Down

0 comments on commit 2cefe5d

Please sign in to comment.