proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 10:04:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16127 from opensourcerouting/fix/eor_not_only_for_gr

Browse Source 
bgpd: Send End-of-RIB not only if Graceful Restart capability is received
This commit is contained in:
Donald Sharp 2024-06-01 10:08:25 -04:00 committed by GitHub
commit 894e72895e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
bgpd/bgp_packet.c
View File

@ -560,40 +560,37 @@ void bgp_generate_updgrp_packets(struct event *thread)
}
}
if (CHECK_FLAG(peer->cap,
PEER_CAP_RESTART_RCV)) {
if (!(PAF_SUBGRP(paf))->t_coalesce
&& peer->afc_nego[afi][safi]
&& peer->synctime
&& !CHECK_FLAG(
peer->af_sflags[afi][safi],
PEER_STATUS_EOR_SEND)) {
/* If EOR is disabled,
* the message is not sent
*/
if (BGP_SEND_EOR(peer->bgp, afi,
safi)) {
SET_FLAG(
peer->af_sflags
[afi]
[safi],
PEER_STATUS_EOR_SEND);
/* rfc4724 says:
* Although the End-of-RIB marker is
* specified for the purpose of BGP
* graceful restart, it is noted that
* the generation of such a marker upon
* completion of the initial update would
* be useful for routing convergence in
* general, and thus the practice is
* recommended.
*/
if (!(PAF_SUBGRP(paf))->t_coalesce &&
peer->afc_nego[afi][safi] &&
peer->synctime &&
!CHECK_FLAG(peer->af_sflags[afi][safi],
PEER_STATUS_EOR_SEND)) {
/* If EOR is disabled, the message is
* not sent.
*/
if (!BGP_SEND_EOR(peer->bgp, afi, safi))
continue;
/* Update EOR
* send time
*/
peer->eor_stime[afi]
[safi] =
monotime(NULL);
SET_FLAG(peer->af_sflags[afi][safi],
PEER_STATUS_EOR_SEND);
BGP_UPDATE_EOR_PKT(
peer, afi, safi,
s);
bgp_process_pending_refresh(
peer, afi,
safi);
}
}
/* Update EOR send time */
peer->eor_stime[afi][safi] =
monotime(NULL);
BGP_UPDATE_EOR_PKT(peer, afi, safi, s);
bgp_process_pending_refresh(peer, afi,
safi);
}
continue;
}