* bgpd.c: Don't crash while deleting list of peer-groups.

[backport candidate]
This commit is contained in:
hasso 2005-05-26 08:29:07 +00:00
parent dc625e8606
commit b6b7cff22d
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,7 @@
2005-05-26 Hasso Tepper <hass at quagga.net>
* bgpd.c: Don't crash while deleting list of peer-groups.
2005-05-25 Hasso Tepper <hasso at quagga.net>
* bgpd.c: Fix obvious (routeserver patch) merge error. This makes "no

View File

@ -1912,6 +1912,7 @@ int
bgp_delete (struct bgp *bgp)
{
struct peer *peer;
struct peer_group *group;
struct listnode *node;
struct listnode *next;
afi_t afi;
@ -1927,8 +1928,8 @@ bgp_delete (struct bgp *bgp)
if (i != ZEBRA_ROUTE_BGP)
bgp_redistribute_unset (bgp, afi, i);
bgp->group->del = (void (*)(void *)) peer_group_delete;
list_delete (bgp->group);
for (ALL_LIST_ELEMENTS (bgp->group, node, next, group))
peer_group_delete (group);
for (ALL_LIST_ELEMENTS (bgp->peer, node, next, peer))
peer_delete (peer);