diff options
| author | Rafael Zalamena <rzalamena@users.noreply.github.com> | 2022-12-19 18:58:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 18:58:49 +0100 |
| commit | 3e44212f9f6310ba7124607e6fedee39e7e25365 (patch) | |
| tree | e72190535243dfc55534850b26033ee94423e0be /zebra | |
| parent | Merge pull request #12534 from donaldsharp/notice_missed (diff) | |
| parent | zebra: Ensure memory is not freed that dplane depends on in shutdown (diff) | |
| download | frr-3e44212f9f6310ba7124607e6fedee39e7e25365.tar.xz frr-3e44212f9f6310ba7124607e6fedee39e7e25365.zip | |
Merge pull request #12538 from donaldsharp/zebra_crash_in_shutdown
zebra: Ensure memory is not freed that dplane depends on in shutdown
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/main.c b/zebra/main.c index 3de97943f..e38f9a85e 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -221,12 +221,12 @@ void zebra_finalize(struct thread *dummy) { zlog_info("Zebra final shutdown"); - /* Final shutdown of ns resources */ - ns_walk_func(zebra_ns_final_shutdown, NULL, NULL); - /* Stop dplane thread and finish any cleanup */ zebra_dplane_shutdown(); + /* Final shutdown of ns resources */ + ns_walk_func(zebra_ns_final_shutdown, NULL, NULL); + zebra_router_terminate(); ns_terminate(); |