[bgpd] CID #6, remove useless NULL check, bgp_static_update_rsclient

2006-05-12 Paul Jakma <paul.jakma@sun.com>

	* bgp_route.c: (bgp_static_update_rsclient) Remove useless NULL
	  check, code already assumes bgp_static can not be NULL,
	  fixes CID #6.
This commit is contained in:
Paul Jakma 2006-05-12 23:29:22 +00:00
parent dd8103a917
commit 06e110f937
2 changed files with 9 additions and 6 deletions

View File

@ -5,6 +5,7 @@
* bgp_route.c: (bgp_static_update_main) Remove useless NULL
check, code already assumes bgp_static can not be NULL,
fixes CID #7.
(bgp_static_update_rsclient) ditto, CID #6
2006-05-08 Paul Jakma <paul.jakma@sun.com>

View File

@ -2937,15 +2937,17 @@ bgp_static_update_rsclient (struct peer *rsclient, struct prefix *p,
bgp = rsclient->bgp;
assert (bgp_static);
if (!bgp_static)
return;
rn = bgp_afi_node_get (rsclient->rib[afi][safi], afi, safi, p, NULL);
bgp_attr_default_set (&attr, BGP_ORIGIN_IGP);
if (bgp_static)
{
attr.nexthop = bgp_static->igpnexthop;
attr.med = bgp_static->igpmetric;
attr.flag |= ATTR_FLAG_BIT (BGP_ATTR_MULTI_EXIT_DISC);
}
attr.nexthop = bgp_static->igpnexthop;
attr.med = bgp_static->igpmetric;
attr.flag |= ATTR_FLAG_BIT (BGP_ATTR_MULTI_EXIT_DISC);
new_attr = attr;