From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 14 Jul 2017 17:29:47 +0000 (-0400)
Subject: pimd: Clean PNC cache handling on shutdown
X-Git-Tag: frr-4.0-dev~468^2~14
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6e1ef388f3e72aba31544b761b2feb736246cb4d;p=mirror%2Ffrr.git

pimd: Clean PNC cache handling on shutdown

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

diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index 6837d7eaa3..93289b6ae4 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -50,11 +50,13 @@ void pim_rp_list_hash_clean(void *data)
 {
 	struct pim_nexthop_cache *pnc;
 
-	pnc = (struct pim_nexthop_cache *)data;
-	if (pnc->rp_list->count)
-		list_delete_all_node(pnc->rp_list);
-	if (pnc->upstream_list->count)
-		list_delete_all_node(pnc->upstream_list);
+	list_delete(pnc->rp_list);
+	pnc->rp_list = NULL;
+
+	list_delete(pnc->upstream_list);
+	pnc->upstream_list = NULL;
+
+	XFREE(MTYPE_PIM_NEXTHOP_CACHE, pnc);
 }
 
 static void pim_rp_info_free(struct rp_info *rp_info)