bgpd: Move SRv6 cleanup functions

Move SRv6 cleanup operations to `bgp_srv6_cleanup` function. Signed-off-by: Carmine Scarpitta <[email protected]>
cscarpitta · May 8, 2024 · 95598c6 · 95598c6
1 parent 54a1375
commit 95598c6
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
@@ -1473,6 +1473,21 @@ static void bgp_srv6_init(struct bgp *bgp)
 
 static void bgp_srv6_cleanup(struct bgp *bgp)
 {
+	for (afi_t afi = AFI_IP; afi < AFI_MAX; afi++) {
+		if (bgp->vpn_policy[afi].tovpn_sid_locator != NULL)
+			srv6_locator_chunk_free(
+				&bgp->vpn_policy[afi].tovpn_sid_locator);
+		if (bgp->vpn_policy[afi].tovpn_zebra_vrf_sid_last_sent != NULL)
+			XFREE(MTYPE_BGP_SRV6_SID,
+			      bgp->vpn_policy[afi]
+				      .tovpn_zebra_vrf_sid_last_sent);
+		if (bgp->vpn_policy[afi].tovpn_sid != NULL) {
+			sid_unregister(bgp, bgp->vpn_policy[afi].tovpn_sid);
+			XFREE(MTYPE_BGP_SRV6_SID,
+			      bgp->vpn_policy[afi].tovpn_sid);
+		}
+	}
+
 	if (bgp->tovpn_sid_locator != NULL)
 		srv6_locator_chunk_free(
 			&bgp->tovpn_sid_locator);
@@ -4148,18 +4163,6 @@ void bgp_free(struct bgp *bgp)
 		if (bgp->vpn_policy[afi].tovpn_rd_pretty)
 			XFREE(MTYPE_BGP_NAME,
 			      bgp->vpn_policy[afi].tovpn_rd_pretty);
-		if (bgp->vpn_policy[afi].tovpn_sid_locator != NULL)
-			srv6_locator_chunk_free(
-				&bgp->vpn_policy[afi].tovpn_sid_locator);
-		if (bgp->vpn_policy[afi].tovpn_zebra_vrf_sid_last_sent != NULL)
-			XFREE(MTYPE_BGP_SRV6_SID,
-			      bgp->vpn_policy[afi]
-				      .tovpn_zebra_vrf_sid_last_sent);
-		if (bgp->vpn_policy[afi].tovpn_sid != NULL) {
-			sid_unregister(bgp, bgp->vpn_policy[afi].tovpn_sid);
-			XFREE(MTYPE_BGP_SRV6_SID,
-			      bgp->vpn_policy[afi].tovpn_sid);
-		}
 	}
 	bgp_srv6_cleanup(bgp);
 	bgp_confederation_id_unset(bgp);