proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 05:28:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13746 from FRRouting/mergify/bp/dev/9.0/pr-13739

Browse Source 
zebra: Prevent crash because nl is NULL on shutdown (backport #13739)
This commit is contained in:
Donatas Abraitis 2023-06-09 15:37:05 +03:00 committed by GitHub
commit 9fa39ba3ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zebra/main.c
View File

@ -206,12 +206,17 @@ void zebra_finalize(struct event *dummy)
vrf_terminate(); vrf_terminate();
/*
* Stop dplane thread and finish any cleanup
* This is before the zebra_ns_early_shutdown call
* because sockets that the dplane depends on are closed
* in those functions
*/
zebra_dplane_shutdown();
ns_walk_func(zebra_ns_early_shutdown, NULL, NULL); ns_walk_func(zebra_ns_early_shutdown, NULL, NULL);
zebra_ns_notify_close(); zebra_ns_notify_close();
/* Stop dplane thread and finish any cleanup */
zebra_dplane_shutdown();
/* Final shutdown of ns resources */ /* Final shutdown of ns resources */
ns_walk_func(zebra_ns_final_shutdown, NULL, NULL); ns_walk_func(zebra_ns_final_shutdown, NULL, NULL);