From d33da0e0713b83108a2aefab56504d970b358922 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 15 Jan 2021 16:28:15 -0500 Subject: [PATCH] zebra: A `zebra route-map delay-timer 0` command should still run the route-map Setting `zebra route-map delay-timer 0` completely turns of any route-map processing in zebra. Which is completely wrong. A timer of 0 means `do it now`. Signed-off-by: Donald Sharp --- zebra/zebra_routemap.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index f4b0fa2d23..229b705ec9 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -1770,12 +1770,11 @@ route_map_result_t zebra_nht_route_map_check(afi_t afi, int client_proto, static void zebra_route_map_mark_update(const char *rmap_name) { /* rmap_update_timer of 0 means don't do route updates */ - if (zebra_rmap_update_timer) { + if (zebra_rmap_update_timer) THREAD_OFF(zebra_t_rmap_update); - thread_add_timer(zrouter.master, zebra_route_map_update_timer, - NULL, zebra_rmap_update_timer, - &zebra_t_rmap_update); - } + + thread_add_timer(zrouter.master, zebra_route_map_update_timer, + NULL, zebra_rmap_update_timer, &zebra_t_rmap_update); } static void zebra_route_map_add(const char *rmap_name)