proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-28 14:21:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: reset mpls-te prior to ospf router removal

Browse Source 
This commits attempts to fix a problem that occurs when mpls-te gets
removed from ospfd config. Mpls-te has an inter-as option, which can be
set to Off/Area/AS. Whenever the inter-as takes "Area" or "AS" as a
value, this value will not be cleaned after removing mpls-te or after
removing the ospf router. Therefore, if mpls-te is configured with
inter-as AS or Area and we remove mpls-te or the ospf router, the
inter-as will still preserve its value; therefore, next time mpls-te is
enabled, it will automatically inherits the previous inter-as value
(either Area or AS). This leads to wrong configuration, which can be a
problem for frr_reload.py.
The commits forces mpls-te to reset inter-as to Off before it mpls-te
gets removed from the configuration and before the ospf router gets
removed.

Signed-off-by: Carlo Galiotto <carlo@voltanet.io>
This commit is contained in:
Carlo Galiotto 2020-11-13 17:35:06 +01:00
parent a6aa46cc1e
commit d424f8d806
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ospfd/ospf_opaque.c
View File

@ -126,6 +126,8 @@ void ospf_opaque_term(void)
void ospf_opaque_finish(void)
{
ospf_mpls_te_finish();
ospf_router_info_finish();
ospf_ext_finish();

12
ospfd/ospf_te.c
View File

@ -187,6 +187,7 @@ void ospf_mpls_te_finish(void)
// list_delete_all_node(OspfMplsTE.iflist);
OspfMplsTE.enabled = false;
ospf_mpls_te_unregister();
OspfMplsTE.inter_as = Off;
}
@ -2229,6 +2230,17 @@ DEFUN (no_ospf_mpls_te,
if (CHECK_FLAG(lp->flags, LPFLG_LSA_ENGAGED))
ospf_mpls_te_lsa_schedule(lp, FLUSH_THIS_LSA);
/*
* This resets the OspfMplsTE.inter_as to its initial state.
* This is to avoid having an inter-as value different from
* Off when mpls-te gets restarted (after being removed)
*/
if (OspfMplsTE.inter_as != Off) {
/* Deregister the Callbacks for Inter-AS support */
ospf_mpls_te_unregister();
OspfMplsTE.inter_as = Off;
}
return CMD_SUCCESS;
}