proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 16:20:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: homogenize deletion of SRGB & SRLB

Browse Source 
Homogenize the code dealing with SRGBs and SRLBs by defining the
same set of utility functions for the deletion of SR blocks.

Signed-off-by: Fredi Raspall <fredi@voltanet.io>
This commit is contained in:
Fredi Raspall 2021-05-28 18:39:52 +02:00 committed by Emanuele Di Pascale
parent 143661c17f
commit c181efbe14
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ospfd/ospf_sr.c
View File

@ -320,9 +320,30 @@ static void sr_local_block_delete(void)
/* Then reset SRLB structure */ /* Then reset SRLB structure */
if (srlb->used_mark != NULL) if (srlb->used_mark != NULL)
XFREE(MTYPE_OSPF_SR_PARAMS, srlb->used_mark); XFREE(MTYPE_OSPF_SR_PARAMS, srlb->used_mark);
srlb->reserved = false; srlb->reserved = false;
} }
/**
* Remove Segment Routing Global block
*/
static void sr_global_block_delete(void)
{
struct sr_global_block *srgb = &OspfSR.srgb;
if (!srgb->reserved)
return;
osr_debug("SR (%s): Remove SRGB [%u/%u]", __func__, srgb->start,
srgb->start + srgb->size - 1);
ospf_zebra_release_label_range(srgb->start,
srgb->start + srgb->size - 1);
srgb->reserved = false;
}
/** /**
* Request a label from the Segment Routing Local Block. * Request a label from the Segment Routing Local Block.
* *
@ -532,13 +553,10 @@ static void ospf_sr_stop(void)
/* Disable any re-attempt to connect to Label Manager */ /* Disable any re-attempt to connect to Label Manager */
THREAD_OFF(OspfSR.t_start_lm); THREAD_OFF(OspfSR.t_start_lm);
/* Release SRGB & SRLB if active. */ /* Release SRGB if active */
if (OspfSR.srgb.reserved) { sr_global_block_delete();
ospf_zebra_release_label_range(
OspfSR.srgb.start, /* Release SRLB if active */
OspfSR.srgb.start + OspfSR.srgb.size - 1);
OspfSR.srgb.reserved = false;
}
sr_local_block_delete(); sr_local_block_delete();
/* /*
@ -2134,12 +2152,8 @@ static int update_sr_blocks(uint32_t gb_lower, uint32_t gb_upper,
/* Release old SRGB if it has changed and is active. */ /* Release old SRGB if it has changed and is active. */
if (gb_changed) { if (gb_changed) {
if (OspfSR.srgb.reserved) {
ospf_zebra_release_label_range( sr_global_block_delete();
OspfSR.srgb.start,
OspfSR.srgb.start + OspfSR.srgb.size - 1);
OspfSR.srgb.reserved = false;
}
/* Set new SRGB values - but do not reserve yet (we need to /* Set new SRGB values - but do not reserve yet (we need to
* release the SRLB too) */ * release the SRLB too) */
@ -2153,7 +2167,7 @@ static int update_sr_blocks(uint32_t gb_lower, uint32_t gb_upper,
/* Release old SRLB if it has changed and reserve new block as needed. /* Release old SRLB if it has changed and reserve new block as needed.
*/ */
if (lb_changed) { if (lb_changed) {
if (OspfSR.srlb.reserved)
sr_local_block_delete(); sr_local_block_delete();
/* Set new SRLB values */ /* Set new SRLB values */
@ -2463,6 +2477,7 @@ DEFUN (sr_prefix_sid,
if (srp == new && CHECK_FLAG(srp->flags, EXT_SUBTLV_PREFIX_SID_NPFLG) if (srp == new && CHECK_FLAG(srp->flags, EXT_SUBTLV_PREFIX_SID_NPFLG)
&& !CHECK_FLAG(srp->flags, EXT_SUBTLV_PREFIX_SID_EFLG)) && !CHECK_FLAG(srp->flags, EXT_SUBTLV_PREFIX_SID_EFLG))
ospf_zebra_delete_prefix_sid(srp); ospf_zebra_delete_prefix_sid(srp);
/* Then, reset Flag & labels to handle flag update */ /* Then, reset Flag & labels to handle flag update */
new->flags = 0; new->flags = 0;
new->label_in = 0; new->label_in = 0;