[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.

diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 0b500158e302e1ff25ee3d831038d01ab3e9de6f..80827393b741085e1e7de0e9d874ac9e7afd801a 100644 (file)
--- 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 385198e23e2286ceedabd6a73ad48750e988b519..c86ca5f057c3ac3d186cd22ac82534e13543214d 100644 (file)
--- 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;