proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 06:39:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6857 from mjstapp/fix_lsp_backup_update

Browse Source 
zebra: reset LSP backup nh info on update
This commit is contained in:
Renato Westphal 2020-08-04 19:12:57 -03:00 committed by GitHub
commit 3b59710cf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/zebra_mpls.c
View File

@ -3321,7 +3321,7 @@ lsp_add_nhlfe(zebra_lsp_t *lsp, enum lsp_types_t type,
/* /*
* Install an LSP and forwarding entry; used primarily * Install an LSP and forwarding entry; used primarily
* from zapi message processing. * from vrf zapi message processing.
*/ */
int mpls_lsp_install(struct zebra_vrf *zvrf, enum lsp_types_t type, int mpls_lsp_install(struct zebra_vrf *zvrf, enum lsp_types_t type,
mpls_label_t in_label, uint8_t num_out_labels, mpls_label_t in_label, uint8_t num_out_labels,
@ -3381,6 +3381,10 @@ static int lsp_znh_install(zebra_lsp_t *lsp, enum lsp_types_t type,
memcpy(nhlfe->nexthop->backup_idx, znh->backup_idx, memcpy(nhlfe->nexthop->backup_idx, znh->backup_idx,
znh->backup_num); znh->backup_num);
SET_FLAG(nhlfe->nexthop->flags, NEXTHOP_FLAG_HAS_BACKUP); SET_FLAG(nhlfe->nexthop->flags, NEXTHOP_FLAG_HAS_BACKUP);
} else {
/* Ensure there's no stale backup info */
UNSET_FLAG(nhlfe->nexthop->flags, NEXTHOP_FLAG_HAS_BACKUP);
nhlfe->nexthop->backup_num = 0;
} }
/* Queue LSP for processing. */ /* Queue LSP for processing. */