From a3f4313cf23fad6c8063386a6b4d35887b5554a6 Mon Sep 17 00:00:00 2001 From: dleroy Date: Mon, 29 Apr 2024 09:40:21 -0700 Subject: [PATCH] nhrpd: fixes core dump on shutdown When nhrpd is shutdown via nhrp_request_stop() the shutdown sequence was not handling the case where there are active shortcut routes installed. The zebra client and shortcut rib were being cleaned up before vrf_terminate() had an opportunity to delete the active routes. Signed-off-by: dleroy (cherry picked from commit a4ee9762734332697ba186ae7223da1eb0445cb2) --- nhrpd/nhrp_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c index adb8be36d3..5d492249d3 100644 --- a/nhrpd/nhrp_main.c +++ b/nhrpd/nhrp_main.c @@ -83,13 +83,13 @@ static void nhrp_request_stop(void) debugf(NHRP_DEBUG_COMMON, "Exiting..."); frr_early_fini(); - nhrp_shortcut_terminate(); + vrf_terminate(); nhrp_nhs_terminate(); nhrp_zebra_terminate(); vici_terminate(); evmgr_terminate(); - vrf_terminate(); nhrp_vc_terminate(); + nhrp_shortcut_terminate(); debugf(NHRP_DEBUG_COMMON, "Done."); -- 2.39.5