proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 21:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: prefer outer label_type for recursive nexthops

Browse Source 
When resolving a recursive nexthop, prefer the "outer"
label type, if present.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2020-05-12 14:27:02 -04:00
parent 420752a9b6
commit 6bc5d97795
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zebra/zebra_nhg.c
View File

@ -1681,17 +1681,37 @@ static void nexthop_set_resolved(afi_t afi, const struct nexthop *newhop,
/* Copy labels of the resolved route and the parent resolving to it */
if (newhop->nh_label) {
for (i = 0; i < newhop->nh_label->num_labels; i++)
for (i = 0; i < newhop->nh_label->num_labels; i++) {
/* Be a bit picky about overrunning the local array */
if (num_labels >= MPLS_MAX_LABELS) {
if (IS_ZEBRA_DEBUG_NHG || IS_ZEBRA_DEBUG_RIB)
zlog_debug("%s: too many labels in newhop %pNHv",
__func__, newhop);
break;
}
labels[num_labels++] = newhop->nh_label->label[i];
}
/* Use the "outer" type */
label_type = newhop->nh_label_type;
}
if (nexthop->nh_label) {
for (i = 0; i < nexthop->nh_label->num_labels; i++)
for (i = 0; i < nexthop->nh_label->num_labels; i++) {
/* Be a bit picky about overrunning the local array */
if (num_labels >= MPLS_MAX_LABELS) {
if (IS_ZEBRA_DEBUG_NHG || IS_ZEBRA_DEBUG_RIB)
zlog_debug("%s: too many labels in nexthop %pNHv",
__func__, nexthop);
break;
}
labels[num_labels++] = nexthop->nh_label->label[i];
}
/* If the parent has labels, use its type */
label_type = nexthop->nh_label_type;
/* If the parent has labels, use its type if
* we don't already have one.
*/
if (label_type == ZEBRA_LSP_NONE)
label_type = nexthop->nh_label_type;
}
if (num_labels)