proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-29 16:17:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bfdd: enable bfd session if vrf interface available

Browse Source 
The vrf interface notification and interface notifications are separated
on zapi interface between the system (zebra daemon) and other daemons
(bfd for instance). In the case of bfd, the initial code was waiting for
vrf notification to create the socket. Actually, in vrf-lite world, we
need to wait the vrf interface to be present, in order to create the
socket and bind to the vrf interface (this is the usual way to work with
vrf-lite).
On bfd, the changes consist in delaying the socket creation first, then
when interface is created, check the interface name presence instead of
checking the interface configuration.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
This commit is contained in:
Philippe Guibert 2021-01-08 09:34:20 +00:00
parent 031705c9fc
commit 039c8158f3
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bfdd/bfd.c
View File

@ -313,6 +313,13 @@ int bfd_session_enable(struct bfd_session *bs)
}
}
if (!vrf_is_backend_netns() && vrf && vrf->vrf_id != VRF_DEFAULT
&& !if_lookup_by_name(vrf->name, vrf->vrf_id)) {
zlog_err("session-enable: vrf interface %s not available yet",
vrf->name);
return 0;
}
if (bs->key.ifname[0]) {
if (vrf)
ifp = if_lookup_by_name(bs->key.ifname, vrf->vrf_id);

19
bfdd/ptm_adapter.c
View File

@ -669,17 +669,24 @@ static void bfdd_sessions_enable_interface(struct interface *ifp)
struct bfd_session *bs;
struct vrf *vrf;
vrf = vrf_lookup_by_id(ifp->vrf_id);
if (!vrf)
return;
TAILQ_FOREACH(bso, &bglobal.bg_obslist, bso_entry) {
bs = bso->bso_bs;
/* Interface name mismatch. */
if (strcmp(ifp->name, bs->key.ifname))
continue;
vrf = vrf_lookup_by_id(ifp->vrf_id);
if (!vrf)
continue;
/* check vrf name */
if (bs->key.vrfname[0] &&
strcmp(vrf->name, bs->key.vrfname))
continue;
/* If Interface matches vrfname, then bypass iface check */
if (vrf_is_backend_netns() || strcmp(ifp->name, vrf->name)) {
/* Interface name mismatch. */
if (strcmp(ifp->name, bs->key.ifname))
continue;
}
/* Skip enabled sessions. */
if (bs->sock != -1)
continue;