summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasso <hasso>2005-05-26 08:29:07 +0000
committerhasso <hasso>2005-05-26 08:29:07 +0000
commitb6b7cff22df912938f6cfd755dcad8cf915be2d0 (patch)
tree26599303f4a7b7364d8d2750f3126b013d78b781
parentdc625e86063125f8ecaaa1502c3cf53f44d76eff (diff)
* bgpd.c: Don't crash while deleting list of peer-groups.
[backport candidate]
-rw-r--r--bgpd/ChangeLog4
-rw-r--r--bgpd/bgpd.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 826b930f..74fe5962 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -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
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index c1995682..f9696610 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -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);