summaryrefslogtreecommitdiff
path: root/ospf6d/ospf6_spf.c
diff options
context:
space:
mode:
Diffstat (limited to 'ospf6d/ospf6_spf.c')
-rw-r--r--ospf6d/ospf6_spf.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c
index b0a8f01bcc..032484e288 100644
--- a/ospf6d/ospf6_spf.c
+++ b/ospf6d/ospf6_spf.c
@@ -284,9 +284,7 @@ static void ospf6_nexthop_calc(struct ospf6_vertex *w, struct ospf6_vertex *v,
oi = ospf6_interface_lookup_by_ifindex(ifindex, ospf6->vrf_id);
if (oi == NULL) {
- if (IS_OSPF6_DEBUG_SPF(PROCESS))
- zlog_debug("Can't find interface in SPF: ifindex %d",
- ifindex);
+ zlog_warn("Can't find interface in SPF: ifindex %d", ifindex);
return;
}
@@ -475,9 +473,7 @@ void ospf6_spf_calculation(uint32_t router_id,
/* construct root vertex */
lsa = ospf6_create_single_router_lsa(oa, oa->lsdb_self, router_id);
if (lsa == NULL) {
- if (IS_OSPF6_DEBUG_SPF(PROCESS))
- zlog_debug("%s: No router LSA for area %s", __func__,
- oa->name);
+ zlog_warn("%s: No router LSA for area %s", __func__, oa->name);
return;
}
@@ -605,7 +601,7 @@ static int ospf6_spf_calculation_thread(struct thread *t)
monotime(&start);
ospf6->ts_spf = start;
- if (ospf6_is_router_abr(ospf6))
+ if (ospf6_check_and_set_router_abr(ospf6))
ospf6_abr_range_reset_cost(ospf6);
for (ALL_LIST_ELEMENTS_RO(ospf6->area_list, node, oa)) {
@@ -645,7 +641,7 @@ static int ospf6_spf_calculation_thread(struct thread *t)
/* External LSA calculation */
ospf6_ase_calculate_timer_add(ospf6);
- if (ospf6_is_router_abr(ospf6))
+ if (ospf6_check_and_set_router_abr(ospf6))
ospf6_abr_defaults_to_stub(ospf6);
monotime(&end);