Browse Source

bgp: Reorg cleanup to align process and bgp instance init/destroy

Signed-off-by: Lou Berger <lberger@labn.net>
Lou Berger 3 years ago
parent
commit
637035710a
2 changed files with 3 additions and 8 deletions
  1. 3 3
      bgpd/bgp_main.c
  2. 0 5
      bgpd/bgpd.c

+ 3 - 3
bgpd/bgp_main.c

@@ -227,7 +227,6 @@ bgp_exit (int status)
   struct listnode *node, *nnode;
   int *socket;
   struct interface *ifp;
-  extern struct zclient *zclient;
   extern struct zclient *zlookup;
 
   /* it only makes sense for this to be called on a clean exit */
@@ -314,8 +313,9 @@ bgp_exit (int status)
   vrf_terminate ();
   cmd_terminate ();
   vty_terminate ();
-  if (zclient)
-    zclient_free (zclient);
+  bgp_address_destroy();
+  bgp_scan_destroy();
+  bgp_zebra_destroy();
   if (zlookup)
     zclient_free (zlookup);
   if (bgp_nexthop_buf)

+ 0 - 5
bgpd/bgpd.c

@@ -2229,11 +2229,6 @@ bgp_delete (struct bgp *bgp)
    */
   bgp_process_queues_drain_immediate();
 
-  bgp_zebra_destroy();
-  bgp_scan_destroy();
-  bgp_address_destroy();
-  
-
   /* Remove visibility via the master list - there may however still be
    * routes to be processed still referencing the struct bgp.
    */