From: Mark Stapp <mjs@voltanet.io>
Date: Fri, 6 Dec 2019 18:44:15 +0000 (-0500)
Subject: lib,sharpd: support labelled nexthop-groups in sharpd
X-Git-Tag: base_7.3~95^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F5498%2Fhead;p=mirror%2Ffrr.git

lib,sharpd: support labelled nexthop-groups in sharpd

Update sharpd's zapi client code to support labelled nexthops if
they're present in a nexthop-group.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
---

diff --git a/lib/nexthop.c b/lib/nexthop.c
index f314fea697..ce8034846f 100644
--- a/lib/nexthop.c
+++ b/lib/nexthop.c
@@ -376,6 +376,9 @@ void nexthop_add_labels(struct nexthop *nexthop, enum lsp_types_t type,
 	struct mpls_label_stack *nh_label;
 	int i;
 
+	if (num_labels == 0)
+		return;
+
 	nexthop->nh_label_type = type;
 	nh_label = XCALLOC(MTYPE_NH_LABEL,
 			   sizeof(struct mpls_label_stack)
diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c
index cd577e9051..797398c791 100644
--- a/sharpd/sharp_zebra.c
+++ b/sharpd/sharp_zebra.c
@@ -265,6 +265,17 @@ void route_add(struct prefix *p, vrf_id_t vrf_id,
 			api_nh->bh_type = nh->bh_type;
 			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++;
 	}
 	api.nexthop_num = i;