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

Merge pull request #9238 from leonshaw/fix/netns-delete

Browse Source 
lib, zebra: Preserve user-configured VRF on netns deletion
This commit is contained in:
Igor Ryzhov 2021-08-02 18:12:19 +03:00 committed by GitHub
commit 72928fa1aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/vrf.c
View File

@ -287,6 +287,7 @@ void vrf_delete(struct vrf *vrf)
RB_REMOVE(vrf_id_head, &vrfs_by_id, vrf); RB_REMOVE(vrf_id_head, &vrfs_by_id, vrf);
vrf->vrf_id = VRF_UNKNOWN; vrf->vrf_id = VRF_UNKNOWN;
} }
vrf->ns_ctxt = NULL;
return; return;
} }

2
zebra/zebra_netns_notify.c
View File

@ -149,8 +149,6 @@ static int zebra_ns_delete(char *name)
"NS notify : no VRF found using NS %s", name); "NS notify : no VRF found using NS %s", name);
return 0; return 0;
} }
/* Clear configured flag and invoke delete. */
UNSET_FLAG(vrf->status, VRF_CONFIGURED);
ns = (struct ns *)vrf->ns_ctxt; ns = (struct ns *)vrf->ns_ctxt;
/* the deletion order is the same /* the deletion order is the same
* as the one used when siging signal is received * as the one used when siging signal is received