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

Merge pull request #8776 from anlancs/fix-ospf-cli-passive-interface

Browse Source 
ospfd: remove ospf interface config: passive-interface
This commit is contained in:
Igor Ryzhov 2021-06-04 11:06:51 +03:00 committed by GitHub
commit 10ddcc321a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ospfd/ospfd.c
View File

@ -688,10 +688,11 @@ void ospf_finish(struct ospf *ospf)
/* Final cleanup of ospf instance */
static void ospf_finish_final(struct ospf *ospf)
{
struct vrf *vrf;
struct vrf *vrf = vrf_lookup_by_id(ospf->vrf_id);
struct route_node *rn;
struct ospf_nbr_nbma *nbr_nbma;
struct ospf_lsa *lsa;
struct interface *ifp;
struct ospf_interface *oi;
struct ospf_area *area;
struct ospf_vl_data *vl_data;
@ -739,6 +740,15 @@ static void ospf_finish_final(struct ospf *ospf)
if (ospf->vrf_id == VRF_DEFAULT)
ospf_ldp_sync_gbl_exit(ospf, true);
/* Remove ospf interface config params: only passive-interface */
FOR_ALL_INTERFACES (vrf, ifp) {
struct ospf_if_params *params;
params = IF_DEF_PARAMS(ifp);
if (OSPF_IF_PARAM_CONFIGURED(params, passive_interface))
UNSET_IF_PARAM(params, passive_interface);
}
/* Reset interface. */
for (ALL_LIST_ELEMENTS(ospf->oiflist, node, nnode, oi))
ospf_if_free(oi);
@ -898,17 +908,11 @@ static void ospf_finish_final(struct ospf *ospf)
ospf->max_multipath = MULTIPATH_NUM;
ospf_delete(ospf);
if (ospf->name) {
vrf = vrf_lookup_by_name(ospf->name);
if (vrf)
ospf_vrf_unlink(ospf, vrf);
XFREE(MTYPE_OSPF_TOP, ospf->name);
} else {
vrf = vrf_lookup_by_id(VRF_DEFAULT);
if (vrf)
ospf_vrf_unlink(ospf, vrf);
}
if (vrf)
ospf_vrf_unlink(ospf, vrf);
if (ospf->name)
XFREE(MTYPE_OSPF_TOP, ospf->name);
XFREE(MTYPE_OSPF_TOP, ospf);
}