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

Merge pull request #1966 from donaldsharp/vrf_late_to_the_party

Browse Source 
zebra: Set table id *before* we enable the vrf
This commit is contained in:
Russ White 2018-03-30 10:51:38 -04:00 committed by GitHub
commit d77d48b9ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
zebra/if_netlink.c
View File

@ -314,6 +314,21 @@ static void netlink_vrf_change(struct nlmsghdr *h, struct rtattr *tb,
return; return;
} }
/*
* This is the only place that we get the actual kernel table_id
* being used. We need it to set the table_id of the routes
* we are passing to the kernel.... And to throw some totally
* awesome parties. that too.
*
* At this point we *must* have a zvrf because the vrf_create
* callback creates one. We *must* set the table id
* before the vrf_enable because of( at the very least )
* static routes being delayed for installation until
* during the vrf_enable callbacks.
*/
zvrf = (struct zebra_vrf *)vrf->info;
zvrf->table_id = nl_table_id;
/* Enable the created VRF. */ /* Enable the created VRF. */
if (!vrf_enable(vrf)) { if (!vrf_enable(vrf)) {
zlog_err("Failed to enable VRF %s id %u", name, zlog_err("Failed to enable VRF %s id %u", name,
@ -321,14 +336,6 @@ static void netlink_vrf_change(struct nlmsghdr *h, struct rtattr *tb,
return; return;
} }
/*
* This is the only place that we get the actual kernel table_id
* being used. We need it to set the table_id of the routes
* we are passing to the kernel.... And to throw some totally
* awesome parties. that too.
*/
zvrf = (struct zebra_vrf *)vrf->info;
zvrf->table_id = nl_table_id;
} else // h->nlmsg_type == RTM_DELLINK } else // h->nlmsg_type == RTM_DELLINK
{ {
if (IS_ZEBRA_DEBUG_KERNEL) if (IS_ZEBRA_DEBUG_KERNEL)