]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #13847 from opensourcerouting/fix/free_zclient_sync_on_destroy
authorDonald Sharp <donaldsharp72@gmail.com>
Sat, 1 Jul 2023 18:35:42 +0000 (14:35 -0400)
committerGitHub <noreply@github.com>
Sat, 1 Jul 2023 18:35:42 +0000 (14:35 -0400)
Stop and free synchronous Zebra client on destroy

1  2 
ospfd/ospf_zebra.c
ospfd/ospfd.c

Simple merge
diff --cc ospfd/ospfd.c
index 053907f2094941a96d88290a3349712da97ed286,0922aecc3745410ca44a900ae18c68c89b6ceb60..fc51c739e4b5cc9635bd63d40055cde1929c7f6c
@@@ -60,9 -60,8 +60,10 @@@ 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;
  
  static void ospf_remove_vls_through_area(struct ospf *, struct ospf_area *);
  static void ospf_network_free(struct ospf *, struct ospf_network *);