thomas.goff at boeing
Aug 19, 2011, 10:27 AM
Post #1 of 4
(357 views)
Permalink
|
|
[PATCH] ospf6d: always remove the result of a previous SPF calculation
|
|
This is needed to avoid stale routes in some cases; the regression was
introduced by commit 1d19234e.
* ospf6_spf.c: (ospf6_spf_calculation) Call ospf6_spf_table_finish()
before possibly returning if no router-LSA is found for the root of
the SPF tree.
Signed-off-by: Tom Goff <thomas.goff [at] boeing>
---
ospf6d/ospf6_spf.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index cb54961..f2bf0b6 100644
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -392,6 +392,8 @@ ospf6_spf_calculation (u_int32_t router_id,
caddr_t lsdesc;
struct ospf6_lsa *lsa;
+ ospf6_spf_table_finish (result_table);
+
/* Install the calculating router itself as the root of the SPF tree */
/* construct root vertex */
lsa = ospf6_lsdb_lookup (htons (OSPF6_LSTYPE_ROUTER), htonl (0),
@@ -403,8 +405,6 @@ ospf6_spf_calculation (u_int32_t router_id,
candidate_list = pqueue_create ();
candidate_list->cmp = ospf6_vertex_cmp;
- ospf6_spf_table_finish (result_table);
-
root = ospf6_vertex_create (lsa);
root->area = oa;
root->cost = 0;
--
1.7.0.4
_______________________________________________
Quagga-dev mailing list
Quagga-dev [at] lists
http://lists.quagga.net/mailman/listinfo/quagga-dev
|
