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

Merge pull request #10412 from idryzhov/zebra-vrf-delete

Browse Source 
zebra: fix vrf deletion
This commit is contained in:
Russ White 2022-01-24 07:33:53 -05:00 committed by GitHub
commit bbf1101240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zebra/if_netlink.c
View File

@ -1761,16 +1761,16 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
desc = (char *)RTA_DATA(tb[IFLA_IFALIAS]); desc = (char *)RTA_DATA(tb[IFLA_IFALIAS]);
} }
/* If VRF, create or update the VRF structure itself. */
if (zif_type == ZEBRA_IF_VRF && !vrf_is_backend_netns()) {
netlink_vrf_change(h, tb[IFLA_LINKINFO], ns_id, name);
vrf_id = (vrf_id_t)ifi->ifi_index;
}
/* See if interface is present. */ /* See if interface is present. */
ifp = if_lookup_by_name_per_ns(zns, name); ifp = if_lookup_by_name_per_ns(zns, name);
if (h->nlmsg_type == RTM_NEWLINK) { if (h->nlmsg_type == RTM_NEWLINK) {
/* If VRF, create or update the VRF structure itself. */
if (zif_type == ZEBRA_IF_VRF && !vrf_is_backend_netns()) {
netlink_vrf_change(h, tb[IFLA_LINKINFO], ns_id, name);
vrf_id = (vrf_id_t)ifi->ifi_index;
}
if (tb[IFLA_MASTER]) { if (tb[IFLA_MASTER]) {
if (slave_kind && (strcmp(slave_kind, "vrf") == 0) if (slave_kind && (strcmp(slave_kind, "vrf") == 0)
&& !vrf_is_backend_netns()) { && !vrf_is_backend_netns()) {
@ -2032,6 +2032,10 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
zebra_l2_vxlanif_del(ifp); zebra_l2_vxlanif_del(ifp);
if_delete_update(ifp); if_delete_update(ifp);
/* If VRF, delete the VRF structure itself. */
if (zif_type == ZEBRA_IF_VRF && !vrf_is_backend_netns())
netlink_vrf_change(h, tb[IFLA_LINKINFO], ns_id, name);
} }
return 0; return 0;