From da5b30f6fb9437f1dc3d05a48e5e17f78695f820 Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Mon, 8 May 2006 14:37:17 +0000 Subject: [bgpd] Bug #240, Fix route-server crash when static routes are configured 2006-05-08 Paul Jakma * bgp_route.c: (bgp_afi_node_get) given table should never be NULL, check/assert this. (bgp_static_update) Bug #240. Rsclients should only be passed the static update if they are configured for the afi,safi. --- bgpd/bgp_route.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'bgpd/bgp_route.c') diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 10c88697..f5d69e88 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -65,7 +65,11 @@ bgp_afi_node_get (struct bgp_table *table, afi_t afi, safi_t safi, struct prefix { struct bgp_node *rn; struct bgp_node *prn = NULL; - + + assert (table); + if (!table) + return NULL; + if (safi == SAFI_MPLS_VPN) { prn = bgp_node_get (table, (struct prefix *) prd); @@ -3177,7 +3181,8 @@ bgp_static_update (struct bgp *bgp, struct prefix *p, for (ALL_LIST_ELEMENTS (bgp->rsclient, node, nnode, rsclient)) { - bgp_static_update_rsclient (rsclient, p, bgp_static, afi, safi); + if (CHECK_FLAG (rsclient->af_flags[afi][safi], PEER_FLAG_RSERVER_CLIENT)) + bgp_static_update_rsclient (rsclient, p, bgp_static, afi, safi); } } -- cgit v1.2.1