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

Merge pull request #8844 from sworleys/Term-Default-VRF-Last

Browse Source 
lib: terminate default vrf last
This commit is contained in:
Renato Westphal 2021-06-14 10:05:52 -03:00 committed by GitHub
commit 60ff22619a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/vrf.c
View File

@ -582,29 +582,38 @@ void vrf_init(int (*create)(struct vrf *), int (*enable)(struct vrf *),
cmd_variable_handler_register(vrf_var_handlers); cmd_variable_handler_register(vrf_var_handlers);
} }
static void vrf_terminate_single(struct vrf *vrf)
{
/* Clear configured flag and invoke delete. */
UNSET_FLAG(vrf->status, VRF_CONFIGURED);
vrf_delete(vrf);
}
/* Terminate VRF module. */ /* Terminate VRF module. */
void vrf_terminate(void) void vrf_terminate(void)
{ {
struct vrf *vrf; struct vrf *vrf, *tmp;
if (debug_vrf) if (debug_vrf)
zlog_debug("%s: Shutting down vrf subsystem", __func__); zlog_debug("%s: Shutting down vrf subsystem", __func__);
while (!RB_EMPTY(vrf_id_head, &vrfs_by_id)) { RB_FOREACH_SAFE (vrf, vrf_id_head, &vrfs_by_id, tmp) {
vrf = RB_ROOT(vrf_id_head, &vrfs_by_id); if (vrf->vrf_id == VRF_DEFAULT)
continue;
/* Clear configured flag and invoke delete. */ vrf_terminate_single(vrf);
UNSET_FLAG(vrf->status, VRF_CONFIGURED);
vrf_delete(vrf);
} }
while (!RB_EMPTY(vrf_name_head, &vrfs_by_name)) { RB_FOREACH_SAFE (vrf, vrf_name_head, &vrfs_by_name, tmp) {
vrf = RB_ROOT(vrf_name_head, &vrfs_by_name); if (vrf->vrf_id == VRF_DEFAULT)
continue;
/* Clear configured flag and invoke delete. */ vrf_terminate_single(vrf);
UNSET_FLAG(vrf->status, VRF_CONFIGURED);
vrf_delete(vrf);
} }
/* Finally terminate default VRF */
vrf = vrf_lookup_by_id(VRF_DEFAULT);
vrf_terminate_single(vrf);
} }
int vrf_socket(int domain, int type, int protocol, vrf_id_t vrf_id, int vrf_socket(int domain, int type, int protocol, vrf_id_t vrf_id,