Merge pull request #4816 from NaveenThanikachalam/610

bgpd: Assertion failed during shutdown.
This commit is contained in:
Donald Sharp 2019-08-11 11:58:36 -04:00 committed by GitHub
commit 269bca525d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5332,6 +5332,13 @@ static void bgp_purge_af_static_redist_routes(struct bgp *bgp, afi_t afi,
struct bgp_node *rn;
struct bgp_path_info *pi;
/* Do not install the aggregate route if BGP is in the
* process of termination.
*/
if (bgp_flag_check(bgp, BGP_FLAG_DELETE_IN_PROGRESS) ||
(bgp->peer_self == NULL))
return;
table = bgp->rib[afi][safi];
for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) {
for (pi = bgp_node_get_bgp_path_info(rn); pi; pi = pi->next) {