pimd: Cleanup bfd memory on shutdown

When shutting down pim, ensure that we cleanup bfd memory

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_bfd.c b/pimd/pim_bfd.c
index f5772174baed91baa40f2a083ae3c9c9b0b5bdb3..4a3cf715dabb27c6f9d4e2275fdfac51fe85e7f1 100644 (file)
--- a/pimd/pim_bfd.c
+++ b/pimd/pim_bfd.c
@@ -99,9 +99,9 @@ void pim_bfd_info_nbr_create(struct pim_interface *pim_ifp,
 /*
  * pim_bfd_info_free - Free BFD info structure
  */
-void pim_bfd_info_free(void **bfd_info)
+void pim_bfd_info_free(struct bfd_info **bfd_info)
 {
-       bfd_info_free((struct bfd_info **)bfd_info);
+       bfd_info_free(bfd_info);
 }
 
 static void pim_bfd_reg_dereg_nbr(struct pim_neighbor *nbr, int command)
@@ -151,7 +151,7 @@ int pim_bfd_reg_dereg_all_nbr(struct interface *ifp, int command)
                if (command != ZEBRA_BFD_DEST_DEREGISTER)
                        pim_bfd_info_nbr_create(pim_ifp, neigh);
                else
-                       bfd_info_free((struct bfd_info **)&neigh->bfd_info);
+                       pim_bfd_info_free((struct bfd_info **)&neigh->bfd_info);
 
                pim_bfd_reg_dereg_nbr(neigh, command);
        }
@@ -170,7 +170,7 @@ void pim_bfd_trigger_event(struct pim_interface *pim_ifp,
                pim_bfd_info_nbr_create(pim_ifp, nbr);
                pim_bfd_reg_dereg_nbr(nbr, ZEBRA_BFD_DEST_REGISTER);
        } else {
-               pim_bfd_info_free((void *)&nbr->bfd_info);
+               pim_bfd_info_free(&nbr->bfd_info);
                pim_bfd_reg_dereg_nbr(nbr, ZEBRA_BFD_DEST_DEREGISTER);
        }
 }

diff --git a/pimd/pim_bfd.h b/pimd/pim_bfd.h
index 0dfd80839fe62fe75ec23759f45a8bb43f46ddf7..83def93b6674130cdb6a5f35cd740477feb5581a 100644 (file)
--- a/pimd/pim_bfd.h
+++ b/pimd/pim_bfd.h
@@ -36,5 +36,5 @@ void pim_bfd_trigger_event(struct pim_interface *pim_ifp,
                           struct pim_neighbor *nbr, uint8_t nbr_up);
 void pim_bfd_info_nbr_create(struct pim_interface *pim_ifp,
                             struct pim_neighbor *neigh);
-void pim_bfd_info_free(void **bfd_info);
+void pim_bfd_info_free(struct bfd_info **bfd_info);
 #endif /* _PIM_BFD_H */

diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index 2730f5e7aa36c86095966703b54ac346f0a558b4..e73422331f7c56918ce0a493abbd3fc2101f2354 100644 (file)
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -409,6 +409,9 @@ void pim_neighbor_free(struct pim_neighbor *neigh)
        list_delete_and_null(&neigh->upstream_jp_agg);
        THREAD_OFF(neigh->jp_timer);
 
+       if (neigh->bfd_info)
+               pim_bfd_info_free(&neigh->bfd_info);
+
        XFREE(MTYPE_PIM_NEIGHBOR, neigh);
 }