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

Merge pull request #17558 from donaldsharp/bfd_fix

Browse Source 
lib: Fix session re-establishment
This commit is contained in:
Jafar Al-Gharaibeh 2024-12-03 20:06:28 -06:00 committed by GitHub
commit 9797f20a1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/bfd.c
View File

@ -32,6 +32,8 @@ enum bfd_session_event {
BSE_UNINSTALL, BSE_UNINSTALL,
/** Install the BFD session configuration. */ /** Install the BFD session configuration. */
BSE_INSTALL, BSE_INSTALL,
/** We should install but it couldn't because of a error talking to zebra */
BSE_VALID_FOR_INSTALL,
}; };
/** /**
@ -527,6 +529,10 @@ static void _bfd_sess_send(struct event *t)
vrf_id_to_name(bsp->args.vrf_id), bsp->args.vrf_id, vrf_id_to_name(bsp->args.vrf_id), bsp->args.vrf_id,
bsp->lastev == BSE_INSTALL ? "installed" bsp->lastev == BSE_INSTALL ? "installed"
: "uninstalled"); : "uninstalled");
bsp->installed = false;
if (bsp->lastev == BSE_INSTALL)
bsp->lastev = BSE_VALID_FOR_INSTALL;
} }
} }
@ -883,7 +889,7 @@ int zclient_bfd_session_replay(ZAPI_CALLBACK_ARGS)
/* Replay all activated peers. */ /* Replay all activated peers. */
TAILQ_FOREACH (bsp, &bsglobal.bsplist, entry) { TAILQ_FOREACH (bsp, &bsglobal.bsplist, entry) {
/* Skip not installed sessions. */ /* Skip not installed sessions. */
if (!bsp->installed) if (!bsp->installed && bsp->lastev != BSE_VALID_FOR_INSTALL)
continue; continue;
/* We are reconnecting, so we must send installation. */ /* We are reconnecting, so we must send installation. */