ospfd: make ospf_maxage_lsa_remover actually yield
ospf_maxage_lsa_remover whould check whether to yield,
but run on anyway.
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
Signed-off-by: David Lamparter <equinox@diac24.net>
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index dfd1a61..e0e05ab 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -2843,6 +2843,9 @@
continue;
}
+ /* There is at least one neighbor from which we still await an ack
+ * for that LSA, so we are not allowed to remove it from our lsdb yet
+ * as per RFC 2328 section 14 para 4 a) */
if (lsa->retransmit_counter > 0)
{
reschedule = 1;
@@ -2851,7 +2854,10 @@
/* TODO: maybe convert this function to a work-queue */
if (thread_should_yield (thread))
- OSPF_TIMER_ON (ospf->t_maxage, ospf_maxage_lsa_remover, 0);
+ {
+ OSPF_TIMER_ON (ospf->t_maxage, ospf_maxage_lsa_remover, 0);
+ return 0;
+ }
/* Remove LSA from the LSDB */
if (IS_LSA_SELF (lsa))