From 893ab8272b465ad22218cc67b37710ed115f7ae7 Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Sat, 25 Apr 2015 21:41:43 +0200 Subject: [PATCH] KRT: Fixes route reload Did not really worked --- sysdep/unix/krt.c | 7 ++++++- sysdep/unix/krt.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index 7cec28c8..efdf4bdd 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -451,7 +451,7 @@ again: *pbest = best->next; best->next = n->routes; n->routes = best; - if (best != old_best || !(n->n.flags & KRF_INSTALLED)) + if (best != old_best || !(n->n.flags & KRF_INSTALLED) || p->reload) { DBG("%I/%d: announcing (metric=%d)\n", n->n.prefix, n->n.pxlen, best->u.krt.metric); krt_learn_announce_update(p, best); @@ -461,6 +461,8 @@ again: DBG("%I/%d: uptodate (metric=%d)\n", n->n.prefix, n->n.pxlen, best->u.krt.metric); } FIB_ITERATE_END(f); + + p->reload = 0; } static void @@ -1031,7 +1033,10 @@ krt_reload_routes(struct proto *P) /* Although we keep learned routes in krt_table, we rather schedule a scan */ if (KRT_CF->learn) + { + p->reload = 1; krt_scan_timer_kick(p); + } return 1; } diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h index 2cd23165..f0fd6261 100644 --- a/sysdep/unix/krt.h +++ b/sysdep/unix/krt.h @@ -66,6 +66,7 @@ struct krt_proto { node krt_node; /* Node in krt_proto_list */ byte ready; /* Initial feed has been finished */ byte initialized; /* First scan has been finished */ + byte reload; /* Next scan is doing reload */ }; extern pool *krt_pool;