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

zebra: include backup lsp nhlfes in 'active' check

Browse Source 
Check backup nhlfes/nexthops for 'active' status when checking
an LSP. Also tweak the show command output for backup nhlfes
slightly.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-06-03 17:01:19 -04:00
parent cc1b974668
commit 5e29e1a10f
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
zebra/zebra_mpls.c
View File

@ -804,8 +804,7 @@ static void lsp_select_best_nhlfe(zebra_lsp_t *lsp)
/* /*
* First compute the best path, after checking nexthop status. We are * First compute the best path, after checking nexthop status. We are
* only * only concerned with non-deleted NHLFEs.
* concerned with non-deleted NHLFEs.
*/ */
frr_each_safe(nhlfe_list, &lsp->nhlfe_list, nhlfe) { frr_each_safe(nhlfe_list, &lsp->nhlfe_list, nhlfe) {
/* Clear selection flags. */ /* Clear selection flags. */
@ -823,6 +822,14 @@ static void lsp_select_best_nhlfe(zebra_lsp_t *lsp)
if (!lsp->best_nhlfe) if (!lsp->best_nhlfe)
return; return;
/*
* Check the active status of backup nhlfes also
*/
frr_each_safe(nhlfe_list, &lsp->backup_nhlfe_list, nhlfe) {
if (!CHECK_FLAG(nhlfe->flags, NHLFE_FLAG_DELETED))
(void)nhlfe_nexthop_active(nhlfe);
}
/* Mark best NHLFE as selected. */ /* Mark best NHLFE as selected. */
SET_FLAG(lsp->best_nhlfe->flags, NHLFE_FLAG_SELECTED); SET_FLAG(lsp->best_nhlfe->flags, NHLFE_FLAG_SELECTED);
@ -917,9 +924,9 @@ static wq_item_status lsp_process(struct work_queue *wq, void *data)
if (IS_ZEBRA_DEBUG_MPLS) { if (IS_ZEBRA_DEBUG_MPLS) {
if (oldbest) if (oldbest)
nhlfe2str(oldbest, buf, BUFSIZ); nhlfe2str(oldbest, buf, sizeof(buf));
if (newbest) if (newbest)
nhlfe2str(newbest, buf2, BUFSIZ); nhlfe2str(newbest, buf2, sizeof(buf2));
zlog_debug( zlog_debug(
"Process LSP in-label %u oldbest %s newbest %s " "Process LSP in-label %u oldbest %s newbest %s "
"flags 0x%x ecmp# %d", "flags 0x%x ecmp# %d",
@ -1573,6 +1580,9 @@ static void nhlfe_print(zebra_nhlfe_t *nhlfe, struct vty *vty)
default: default:
break; break;
} }
vty_out(vty, "%s",
CHECK_FLAG(nhlfe->flags, NHLFE_FLAG_IS_BACKUP) ? " (backup)"
: "");
vty_out(vty, "%s", vty_out(vty, "%s",
CHECK_FLAG(nhlfe->flags, NHLFE_FLAG_INSTALLED) ? " (installed)" CHECK_FLAG(nhlfe->flags, NHLFE_FLAG_INSTALLED) ? " (installed)"
: ""); : "");
@ -1600,6 +1610,7 @@ static void lsp_print(struct vty *vty, zebra_lsp_t *lsp)
/* Find backup in backup list */ /* Find backup in backup list */
i = 0; i = 0;
backup = NULL;
frr_each(nhlfe_list, &lsp->backup_nhlfe_list, backup) { frr_each(nhlfe_list, &lsp->backup_nhlfe_list, backup) {
if (i == nhlfe->nexthop->backup_idx) if (i == nhlfe->nexthop->backup_idx)
break; break;