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

bgpd: release all memory explicitly on exit

Browse Source
This commit is contained in:
Renato Westphal 2016-10-25 00:04:24 -02:00
parent 37d361e7fd
commit 0c6262ed6a
3 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
bgpd/bgp_route.c
View File

@ -3123,7 +3123,7 @@ bgp_clear_route_table (struct peer *peer, afi_t afi, safi_t safi,
struct bgp_table *table)
{
struct bgp_node *rn;
int force = bm->process_main_queue ? 0 : 1;
if (! table)
table = peer->bgp->rib[afi][safi];
@ -3134,7 +3134,7 @@ bgp_clear_route_table (struct peer *peer, afi_t afi, safi_t safi,
for (rn = bgp_table_top (table); rn; rn = bgp_route_next (rn))
{
struct bgp_info *ri;
struct bgp_info *ri, *next;
struct bgp_adj_in *ain;
struct bgp_adj_in *ain_next;
@ -3186,20 +3186,28 @@ bgp_clear_route_table (struct peer *peer, afi_t afi, safi_t safi,
ain = ain_next;
}
for (ri = rn->info; ri; ri = ri->next)
if (ri->peer == peer)
{
struct bgp_clear_node_queue *cnq;
for (ri = rn->info; ri; ri = next)
{
next = ri->next;
if (ri->peer != peer)
continue;
/* both unlocked in bgp_clear_node_queue_del */
bgp_table_lock (bgp_node_table (rn));
bgp_lock_node (rn);
cnq = XCALLOC (MTYPE_BGP_CLEAR_NODE_QUEUE,
sizeof (struct bgp_clear_node_queue));
cnq->rn = rn;
work_queue_add (peer->clear_node_queue, cnq);
break;
}
if (force)
bgp_info_reap (rn, ri);
else
{
struct bgp_clear_node_queue *cnq;
/* both unlocked in bgp_clear_node_queue_del */
bgp_table_lock (bgp_node_table (rn));
bgp_lock_node (rn);
cnq = XCALLOC (MTYPE_BGP_CLEAR_NODE_QUEUE,
sizeof (struct bgp_clear_node_queue));
cnq->rn = rn;
work_queue_add (peer->clear_node_queue, cnq);
break;
}
}
}
return;
}
@ -3336,51 +3344,47 @@ bgp_cleanup_table(struct bgp_table *table, safi_t safi)
vnc_import_bgp_del_route(table->owner->bgp, &rn->p, ri);
#endif
bgp_zebra_withdraw (&rn->p, ri, safi);
bgp_info_reap (rn, ri);
}
}
}
/* Delete all kernel routes. */
void
bgp_cleanup_routes (void)
bgp_cleanup_routes (struct bgp *bgp)
{
struct bgp *bgp;
struct listnode *node, *nnode;
afi_t afi;
for (ALL_LIST_ELEMENTS (bm->bgp, node, nnode, bgp))
for (afi = AFI_IP; afi < AFI_MAX; ++afi)
{
for (afi = AFI_IP; afi < AFI_MAX; ++afi)
struct bgp_node *rn;
bgp_cleanup_table(bgp->rib[afi][SAFI_UNICAST], SAFI_UNICAST);
/*
* VPN and ENCAP tables are two-level (RD is top level)
*/
for (rn = bgp_table_top(bgp->rib[afi][SAFI_MPLS_VPN]); rn;
rn = bgp_route_next (rn))
{
struct bgp_node *rn;
bgp_cleanup_table(bgp->rib[afi][SAFI_UNICAST], SAFI_UNICAST);
/*
* VPN and ENCAP tables are two-level (RD is top level)
*/
for (rn = bgp_table_top(bgp->rib[afi][SAFI_MPLS_VPN]); rn;
rn = bgp_route_next (rn))
if (rn->info)
{
if (rn->info)
{
bgp_cleanup_table((struct bgp_table *)(rn->info), SAFI_MPLS_VPN);
bgp_table_finish ((struct bgp_table **)&(rn->info));
rn->info = NULL;
bgp_unlock_node(rn);
}
bgp_cleanup_table((struct bgp_table *)(rn->info), SAFI_MPLS_VPN);
bgp_table_finish ((struct bgp_table **)&(rn->info));
rn->info = NULL;
bgp_unlock_node(rn);
}
}
for (rn = bgp_table_top(bgp->rib[afi][SAFI_ENCAP]); rn;
rn = bgp_route_next (rn))
for (rn = bgp_table_top(bgp->rib[afi][SAFI_ENCAP]); rn;
rn = bgp_route_next (rn))
{
if (rn->info)
{
if (rn->info)
{
bgp_cleanup_table((struct bgp_table *)(rn->info), SAFI_ENCAP);
bgp_table_finish ((struct bgp_table **)&(rn->info));
rn->info = NULL;
bgp_unlock_node(rn);
}
bgp_cleanup_table((struct bgp_table *)(rn->info), SAFI_ENCAP);
bgp_table_finish ((struct bgp_table **)&(rn->info));
rn->info = NULL;
bgp_unlock_node(rn);
}
}
}

2
bgpd/bgp_route.h
View File

@ -241,7 +241,7 @@ bgp_bump_version (struct bgp_node *node)
extern void bgp_process_queue_init (void);
extern void bgp_route_init (void);
extern void bgp_route_finish (void);
extern void bgp_cleanup_routes (void);
extern void bgp_cleanup_routes (struct bgp *);
extern void bgp_announce_route (struct peer *, afi_t, safi_t);
extern void bgp_stop_announce_route_timer(struct peer_af *paf);
extern void bgp_announce_route_all (struct peer *);

4
bgpd/bgpd.c
View File

@ -3186,8 +3186,8 @@ bgp_delete (struct bgp *bgp)
#if ENABLE_BGP_VNC
rfapi_delete(bgp);
bgp_cleanup_routes(); /* rfapi cleanup can create route entries! */
#endif
bgp_cleanup_routes(bgp);
/* Remove visibility via the master list - there may however still be
* routes to be processed still referencing the struct bgp.
@ -7601,8 +7601,6 @@ bgp_terminate (void)
bgp_notify_send (peer, BGP_NOTIFY_CEASE,
BGP_NOTIFY_CEASE_PEER_UNCONFIG);
bgp_cleanup_routes ();
if (bm->process_main_queue)
{
work_queue_free (bm->process_main_queue);