diff options
| author | Mark Stapp <mjs@voltanet.io> | 2020-03-17 14:47:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 14:47:58 -0400 |
| commit | 7bffea9dff1cf23b92ff2343a1e241d718d1d5cf (patch) | |
| tree | eaf9eb64bd77c7d22bad7f949c46ac8b8b867a34 /zebra/main.c | |
| parent | 7967afda0799711bf4ce3bfe8b8b51ceb179376e (diff) | |
| parent | a2665e381ce0929d8194f840bb8a255ee52f3f9b (diff) | |
Merge pull request #6006 from sarav511/zbr_crsh
zebra: Disable rmap update thread before routemap_finish while shutting down Zebra
Diffstat (limited to 'zebra/main.c')
| -rw-r--r-- | zebra/main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/zebra/main.c b/zebra/main.c index 5951c7e280..dab1449194 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -53,6 +53,7 @@ #include "zebra/zebra_rnh.h" #include "zebra/zebra_pbr.h" #include "zebra/zebra_vxlan.h" +#include "zebra/zebra_routemap.h" #if defined(HANDLE_NETLINK_FUZZING) #include "zebra/kernel_netlink.h" @@ -179,7 +180,13 @@ static void sigint(void) access_list_reset(); prefix_list_reset(); - route_map_finish(); + /* + * zebra_routemap_finish will + * 1 set rmap upd timer to 0 so that rmap update wont be scheduled again + * 2 Put off the rmap update thread + * 3 route_map_finish + */ + zebra_routemap_finish(); list_delete(&zrouter.client_list); |