diff options
| author | Paul Jakma <paul.jakma@sun.com> | 2006-05-12 23:29:22 +0000 |
|---|---|---|
| committer | Paul Jakma <paul.jakma@sun.com> | 2006-05-12 23:29:22 +0000 |
| commit | 06e110f9372f61bea23c2eaa25e7850b254bbd1a (patch) | |
| tree | a705c52302d9044f6ae7121ec7eadb62a072d5fe | |
| parent | dd8103a917c356abfdd166879186df2e5d1ca95a (diff) | |
[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.
| -rw-r--r-- | bgpd/ChangeLog | 1 | ||||
| -rw-r--r-- | bgpd/bgp_route.c | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog index 0b500158..80827393 100644 --- a/bgpd/ChangeLog +++ b/bgpd/ChangeLog @@ -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> diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 385198e2..c86ca5f0 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -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; |