[ospf6d] Fix removal of defunct ASBR routes

2007-10-22 Phil Spagnolo <phillip.a.spagnolo@boeing.com>

	* ospf6_asbr.c: (ospf6_asbr_lsentry_remove) Remove shortcut
	  of LSDB search - it's based on assumption non-BEST routes
	  can't have ASBR routes, which appears to be wrong. Safest to
	  search.

diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index b9bea6911f579301e1bb073c008fd7caf258addd..f4ad9283bfa6334fde33d7c7ae5d862a3db347b7 100644 (file)
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-22 Phil Spagnolo <phillip.a.spagnolo@boeing.com>
+
+       * ospf6_asbr.c: (ospf6_asbr_lsentry_remove) Remove shortcut
+         of LSDB search - it's based on assumption non-BEST routes
+         can't have ASBR routes, which appears to be wrong. Safest to
+         search.
+
 2007-06-07 Pavol Rusnak <prusnak@suse.cz>
 
        * ospf6_lsa.c: (no_debug_ospf6_lsa_hex_cmd) Fix bug: must use strcmp

diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 1b6ccbd999a1961e02d0e3a5b181ffdf8ef15c0d..c12eecae419da23e70920ac2fb3a24854c650ffb 100644 (file)
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -325,15 +325,6 @@ ospf6_asbr_lsentry_remove (struct ospf6_route *asbr_entry)
   u_int16_t type;
   u_int32_t router;
 
-  if (! CHECK_FLAG (asbr_entry->flag, OSPF6_ROUTE_BEST))  
-    {
-      char buf[16];
-      inet_ntop (AF_INET, &ADV_ROUTER_IN_PREFIX (&asbr_entry->prefix),
-                 buf, sizeof (buf));
-      zlog_info ("ignore non-best path: lsentry %s remove", buf);
-      return;
-    }
-
   type = htons (OSPF6_LSTYPE_AS_EXTERNAL);
   router = ospf6_linkstate_prefix_adv_router (&asbr_entry->prefix);
   for (lsa = ospf6_lsdb_type_router_head (type, router, ospf6->lsdb);