diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2023-07-01 20:35:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-01 20:35:42 +0200 |
| commit | 1f322e4cef0df7c736af7626ad7c9dc6f03e4bcc (patch) | |
| tree | 2eec3cba264caeeced5f36152e1c8c4cf4e86c29 /ospfd | |
| parent | Merge pull request #13878 from opensourcerouting/fix/staticd_ecmp_rib_delete_... (diff) | |
| parent | ldpd: Stop and free synchronous Zebra client on destroy (diff) | |
| download | frr-1f322e4cef0df7c736af7626ad7c9dc6f03e4bcc.tar.xz frr-1f322e4cef0df7c736af7626ad7c9dc6f03e4bcc.zip | |
Merge pull request #13847 from opensourcerouting/fix/free_zclient_sync_on_destroy
Stop and free synchronous Zebra client on destroy
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_zebra.c | 2 | ||||
| -rw-r--r-- | ospfd/ospfd.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c index a5372dfc4..96d474fe8 100644 --- a/ospfd/ospf_zebra.c +++ b/ospfd/ospf_zebra.c @@ -47,7 +47,7 @@ DEFINE_MTYPE_STATIC(OSPFD, OSPF_REDISTRIBUTE, "OSPF Redistriute"); /* Zebra structure to hold current status. */ struct zclient *zclient = NULL; /* and for the Synchronous connection to the Label Manager */ -static struct zclient *zclient_sync; +struct zclient *zclient_sync; /* For registering threads. */ extern struct event_loop *master; diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 053907f20..fc51c739e 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -60,6 +60,7 @@ struct ospf_master *om; unsigned short ospf_instance; extern struct zclient *zclient; +extern struct zclient *zclient_sync; /* OSPF config processing timer thread */ struct event *t_ospf_cfg; @@ -683,6 +684,8 @@ void ospf_terminate(void) */ zclient_stop(zclient); zclient_free(zclient); + zclient_stop(zclient_sync); + zclient_free(zclient_sync); done: frr_fini(); |