diff options
| author | Russ White <russ@riw.us> | 2025-02-18 10:27:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-18 10:27:46 -0500 |
| commit | 1c961e286443843e4dd287938989565b826caf56 (patch) | |
| tree | b2b5186a87e359ea51bdac47ed98db07d90cd5a0 | |
| parent | c531cf66b4747dee3d76b31f3b429505fa0a4e70 (diff) | |
| parent | c7047bee5d8f7b02f952f05af9293cc97278f0fe (diff) | |
Merge pull request #18157 from FRRouting/mergify/bp/stable/10.0/pr-18121
bgpd: release manual vpn label on instance deletion (backport #18121)
| -rw-r--r-- | bgpd/bgpd.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index d854367163..db4fab2421 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -3891,6 +3891,37 @@ int bgp_delete(struct bgp *bgp) bgp_vpn_leak_unimport(bgp); +<<<<<<< HEAD +======= + /* + * Release SRv6 SIDs, like it's done in `vpn_leak_postchange()` + * and bgp_sid_vpn_export_cmd/af_sid_vpn_export_cmd commands. + */ + bgp->tovpn_sid_index = 0; + UNSET_FLAG(bgp->vrf_flags, BGP_VRF_TOVPN_SID_AUTO); + delete_vrf_tovpn_sid_per_vrf(bgp_default, bgp); + for (afi = AFI_IP; afi < AFI_MAX; afi++) { + bgp->vpn_policy[afi].tovpn_sid_index = 0; + UNSET_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_SID_AUTO); + delete_vrf_tovpn_sid_per_af(bgp_default, bgp, afi); + + vpn_leak_zebra_vrf_sid_withdraw(bgp, afi); + } + + /* release auto vpn labels */ + bgp_vpn_release_label(bgp, AFI_IP, true); + bgp_vpn_release_label(bgp, AFI_IP6, true); + + /* release manual vpn labels */ + for (afi = AFI_IP; afi < AFI_MAX; afi++) { + if (!CHECK_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_LABEL_MANUAL_REG)) + continue; + bgp_zebra_release_label_range(bgp->vpn_policy[afi].tovpn_label, + bgp->vpn_policy[afi].tovpn_label); + UNSET_FLAG(bgp->vpn_policy[afi].flags, BGP_VPN_POLICY_TOVPN_LABEL_MANUAL_REG); + } + +>>>>>>> d6363625c (bgpd: release manual vpn label on instance deletion) hook_call(bgp_inst_delete, bgp); FOREACH_AFI_SAFI (afi, safi) |