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

zebra: Allow tunneldump data to work properly on non-supported kernels

Browse Source 
When zebra requests tunnel data it is sending a RTM_GETTUNNEL per
interface that is a VXLAN tunnel.  If the kernel that is being
used does not support the particular request type then zebra
will get a error message per tunnel request back.  Unfortunately
netlink_parse_info *stops* reading on the first error message.
Therefor one kernels that are returning an error message
let's gather all of those errors.  This will allow things
like route reads to actually work properly

Fixes: #12056
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-10-04 08:51:38 -04:00
parent 4b72a7be69
commit 451165eb57
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zebra/if_netlink.c
View File

@ -1182,13 +1182,19 @@ int interface_lookup_netlink(struct zebra_ns *zns)
if (ret < 0)
return ret;
/*
* So netlink_tunneldump_read will initiate a request
* per tunnel to get data. If we are on a kernel that
* does not support this then we will get X error messages
* (one per tunnel request )back which netlink_parse_info will
* stop after the first one. So we need to read equivalent
* error messages per tunnel then we can continue.
* if we do not gather all the read failures then
* later requests will not work right.
*/
ret = netlink_tunneldump_read(zns);
if (ret < 0)
return ret;
ret = netlink_parse_info(netlink_interface, netlink_cmd, &dp_info, 0,
true);
if (ret < 0)
return ret;
/* fixup linkages */
zebra_if_update_all_links(zns);
@ -2322,6 +2328,7 @@ int netlink_tunneldump_read(struct zebra_ns *zns)
struct route_node *rn;
struct interface *tmp_if = NULL;
struct zebra_if *zif;
struct nlsock *netlink_cmd = &zns->netlink_cmd;
zebra_dplane_info_from_zns(&dp_info, zns, true /*is_cmd*/);
@ -2337,7 +2344,14 @@ int netlink_tunneldump_read(struct zebra_ns *zns)
tmp_if->ifindex);
if (ret < 0)
return ret;
ret = netlink_parse_info(netlink_interface, netlink_cmd,
&dp_info, 0, true);
if (ret < 0)
return ret;
}
return 0;
}
#endif /* GNU_LINUX */