Merge pull request #14802 from Keelan10/fix-nht-leak

sharpd: Set Callback Function for Memory Cleanup
FRRouting · Nov 15, 2023 · 4cce1e4 · 4cce1e4
2 parents 3c4d64d + 9dd86de
commit 4cce1e4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/sharpd/sharp_main.c b/sharpd/sharp_main.c
@@ -60,6 +60,7 @@ static void sharp_global_init(void)
 {
 	memset(&sg, 0, sizeof(sg));
 	sg.nhs = list_new();
+	sg.nhs->del = (void (*)(void *))sharp_nh_tracker_free;
 	sg.ted = NULL;
 	sg.srv6_locators = list_new();
 }

diff --git a/sharpd/sharp_nht.c b/sharpd/sharp_nht.c
@@ -40,6 +40,11 @@ struct sharp_nh_tracker *sharp_nh_tracker_get(struct prefix *p)
 	return nht;
 }
 
+void sharp_nh_tracker_free(struct sharp_nh_tracker *nht)
+{
+	XFREE(MTYPE_NH_TRACKER, nht);
+}
+
 void sharp_nh_tracker_dump(struct vty *vty)
 {
 	struct listnode *node;

diff --git a/sharpd/sharp_nht.h b/sharpd/sharp_nht.h
@@ -18,6 +18,7 @@ struct sharp_nh_tracker {
 };
 
 extern struct sharp_nh_tracker *sharp_nh_tracker_get(struct prefix *p);
+extern void sharp_nh_tracker_free(struct sharp_nh_tracker *nht);
 
 extern void sharp_nh_tracker_dump(struct vty *vty);
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ struct sharp_nh_tracker { @@
     };
     extern struct sharp_nh_tracker *sharp_nh_tracker_get(struct prefix *p);
+    extern void sharp_nh_tracker_free(struct sharp_nh_tracker *nht);
     extern void sharp_nh_tracker_dump(struct vty *vty);
@@ Expand Down @@