matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

zebra: fix loading kernel routs without netlink

Browse source 
Commit 605df8d44 zebra: Use zebra dplane for RTM link and addr broke loading of
kernel routes at startup for configurations without netlink.

It rearranged the startup sequence in zebra_ns_enable() to pass via
zebra_ns_startup_continue(), triggered through zebra_dplane_startup_stage()
calls. However, it neglected to make these calls in the non-netlink code path.
As a result zebra failed to load kernel routes at startup on platforms such
as FreeBSD.

Insert these calls so we run through all of the expected startup stages.

Signed-off-by: Kristof Provost <kprovost@netgate.com>
This commit is contained in:
Kristof Provost 2024-08-15 18:34:35 +02:00 committed by Kristof Provost
parent fa50fde954
commit f0aa8d4f42
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zebra/if_ioctl.c
View file

@ -296,6 +296,8 @@ void interface_list(struct zebra_ns *zns)
/proc/net/if_inet6. */
ifaddr_proc_ipv6();
#endif /* HAVE_PROC_NET_IF_INET6 */
zebra_dplane_startup_stage(zns, ZEBRA_DPLANE_INTERFACES_READ);
}
#endif /* OPEN_BSD */

2
zebra/if_sysctl.c
View file

@ -128,6 +128,8 @@ void interface_list(struct zebra_ns *zns)
/* Free sysctl buffer. */
XFREE(MTYPE_TMP, ref);
zebra_dplane_startup_stage(zns, ZEBRA_DPLANE_INTERFACES_READ);
}
#endif /* !defined(GNU_LINUX) && !defined(OPEN_BSD) */

2
zebra/kernel_socket.c
View file

@ -1468,10 +1468,12 @@ static void routing_socket(struct zebra_ns *zns)
void interface_list_second(struct zebra_ns *zns)
{
zebra_dplane_startup_stage(zns, ZEBRA_DPLANE_ADDRESSES_READ);
}
void interface_list_tunneldump(struct zebra_ns *zns)
{
zebra_dplane_startup_stage(zns, ZEBRA_DPLANE_TUNNELS_READ);
}
/* Exported interface function. This function simply calls