proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 13:06:51 +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, /* rfc4724 says:
PEER_CAP_RESTART_RCV)) { * Although the End-of-RIB marker is
if (!(PAF_SUBGRP(paf))->t_coalesce * specified for the purpose of BGP
&& peer->afc_nego[afi][safi] * graceful restart, it is noted that
&& peer->synctime * the generation of such a marker upon
&& !CHECK_FLAG( * completion of the initial update would
peer->af_sflags[afi][safi], * be useful for routing convergence in
PEER_STATUS_EOR_SEND)) { * general, and thus the practice is
/* If EOR is disabled, * recommended.
* the message is not sent */
*/ if (!(PAF_SUBGRP(paf))->t_coalesce &&
if (BGP_SEND_EOR(peer->bgp, afi, peer->afc_nego[afi][safi] &&
safi)) { peer->synctime &&
SET_FLAG( !CHECK_FLAG(peer->af_sflags[afi][safi],
peer->af_sflags PEER_STATUS_EOR_SEND)) {
[afi] /* If EOR is disabled, the message is
[safi], * not sent.
PEER_STATUS_EOR_SEND); */
if (!BGP_SEND_EOR(peer->bgp, afi, safi))
continue;
/* Update EOR SET_FLAG(peer->af_sflags[afi][safi],
* send time PEER_STATUS_EOR_SEND);
*/
peer->eor_stime[afi]
[safi] =
monotime(NULL);
BGP_UPDATE_EOR_PKT( /* Update EOR send time */
peer, afi, safi, peer->eor_stime[afi][safi] =
s); monotime(NULL);
bgp_process_pending_refresh(
peer, afi, BGP_UPDATE_EOR_PKT(peer, afi, safi, s);
safi); bgp_process_pending_refresh(peer, afi,
} safi);
}
} }
continue; continue;
} }