[bgpd] CID #7, remove useless NULL check, bgp_static_update_main
2006-05-12 Paul Jakma <paul.jakma@sun.com>
* bgp_route.c: (bgp_static_update_main) Remove useless NULL
check, code already assumes bgp_static can not be NULL,
fixes CID #7.
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index f5d69e8..385198e 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -3073,15 +3073,17 @@
struct attr *attr_new;
int ret;
+ assert (bgp_static);
+ if (!bgp_static)
+ return;
+
rn = bgp_afi_node_get (bgp->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);
/* Apply route-map. */
if (bgp_static->rmap.name)