proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 01:57:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5498 from mjstapp/sharp_with_labels

Browse Source 
lib,sharpd: support labelled nexthop-groups in sharpd
This commit is contained in:
Donald Sharp 2019-12-07 11:44:02 -05:00 committed by GitHub
commit 0dcbec72aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/nexthop.c
View File

@ -376,6 +376,9 @@ void nexthop_add_labels(struct nexthop *nexthop, enum lsp_types_t type,
struct mpls_label_stack *nh_label; struct mpls_label_stack *nh_label;
int i; int i;
if (num_labels == 0)
return;
nexthop->nh_label_type = type; nexthop->nh_label_type = type;
nh_label = XCALLOC(MTYPE_NH_LABEL, nh_label = XCALLOC(MTYPE_NH_LABEL,
sizeof(struct mpls_label_stack) sizeof(struct mpls_label_stack)

11
sharpd/sharp_zebra.c
View File

@ -265,6 +265,17 @@ void route_add(struct prefix *p, vrf_id_t vrf_id,
api_nh->bh_type = nh->bh_type; api_nh->bh_type = nh->bh_type;
break; break;
} }
if (nh->nh_label && nh->nh_label->num_labels > 0) {
int j;
SET_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_LABEL);
api_nh->label_num = nh->nh_label->num_labels;
for (j = 0; j < nh->nh_label->num_labels; j++)
api_nh->labels[j] = nh->nh_label->label[j];
}
i++; i++;
} }
api.nexthop_num = i; api.nexthop_num = i;