lib: fix nexthop node entry from nhg_list

When stopping a VRF, the linked list entries must be removed too. Fixes: 98cbbae ("lib: Handle if up/down and vrf enable/disable events") Signed-off-by: Philippe Guibert <[email protected]>
FRRouting · Nov 30, 2023 · dd15b0a · dd15b0a
1 parent 16a28b7
commit dd15b0a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/nexthop_group.c b/lib/nexthop_group.c
@@ -1234,9 +1234,9 @@ void nexthop_group_disable_vrf(struct vrf *vrf)
 	struct nexthop_hold *nhh;
 
 	RB_FOREACH (nhgc, nhgc_entry_head, &nhgc_entries) {
-		struct listnode *node;
+		struct listnode *node, *nnode;
 
-		for (ALL_LIST_ELEMENTS_RO(nhgc->nhg_list, node, nhh)) {
+		for (ALL_LIST_ELEMENTS(nhgc->nhg_list, node, nnode, nhh)) {
 			struct nexthop nhop;
 			struct nexthop *nh;
 
@@ -1257,6 +1257,8 @@ void nexthop_group_disable_vrf(struct vrf *vrf)
 				nhg_hooks.del_nexthop(nhgc, nh);
 
 			nexthop_free(nh);
+
+			list_delete_node(nhgc->nhg_list, node);
 		}
 	}
 }