From f6e7507eb65897f785cafeca302d3c5c56171e06 Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Thu, 10 Jun 2021 20:21:51 +0300 Subject: [PATCH] bgpd: fix routemap update with disabled delay timer - vnc_routemap_update is called only for the last bgp instance - vpn_policy_routemap_event is not called at all - unguarded debug (there's already a debug inside the called function) Make the code consistent with the callback code that is used when the delay timer is enabled. Signed-off-by: Igor Ryzhov --- bgpd/bgp_routemap.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index 921a3e0dd9..806a771cfb 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -3767,7 +3767,6 @@ static void bgp_route_map_process_update_cb(char *rmap_name) bgp_route_map_process_update(bgp, rmap_name, 1); #ifdef ENABLE_BGP_VNC - /* zlog_debug("%s: calling vnc_routemap_update", __func__); */ vnc_routemap_update(bgp, __func__); #endif } @@ -3807,12 +3806,14 @@ static void bgp_route_map_mark_update(const char *rmap_name) BGP_POLICY_ROUTE_MAP, rmap_name, 1, 1); } else { - for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) + for (ALL_LIST_ELEMENTS(bm->bgp, node, nnode, bgp)) { bgp_route_map_process_update(bgp, rmap_name, 0); #ifdef ENABLE_BGP_VNC - zlog_debug("%s: calling vnc_routemap_update", __func__); - vnc_routemap_update(bgp, __func__); + vnc_routemap_update(bgp, __func__); #endif + } + + vpn_policy_routemap_event(rmap_name); } } -- 2.39.5