summaryrefslogtreecommitdiff
path: root/ospf6d
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2007-10-22 18:34:41 +0000
committerPaul Jakma <paul.jakma@sun.com>2007-10-22 18:34:41 +0000
commitfbdbf1281660de877ef687a82145e82934f35744 (patch)
tree15ba59e954cf816e5159a4c034c118f994b88057 /ospf6d
parenta56ef88348be9f019631d6bc92801aae647be05b (diff)
[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.
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ChangeLog7
-rw-r--r--ospf6d/ospf6_asbr.c9
2 files changed, 7 insertions, 9 deletions
diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index b9bea691..f4ad9283 100644
--- 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 1b6ccbd9..c12eecae 100644
--- 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);