From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 24 Aug 2017 12:30:08 +0000 (-0400)
Subject: lib: Fix nexthop num
X-Git-Tag: frr-4.0-dev~377^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F1038%2Fhead;p=mirror%2Ffrr.git

lib: Fix nexthop num

If we assign MULTIPATH_NUM to be 256, this causes issues
for us since 256 is bigger than a u_char.  So let's make
the api's multipath_num to be a u_int16_t and pass it
around as a word.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/lib/zclient.c b/lib/zclient.c
index 75005d656b..72fa2679b3 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -940,7 +940,7 @@ int zapi_route_encode(u_char cmd, struct stream *s, struct zapi_route *api)
 			api->nexthop_num = MULTIPATH_NUM;
 		}
 
-		stream_putc(s, api->nexthop_num);
+		stream_putw(s, api->nexthop_num);
 
 		for (i = 0; i < api->nexthop_num; i++) {
 			api_nh = &api->nexthops[i];
@@ -1047,7 +1047,7 @@ int zapi_route_decode(struct stream *s, struct zapi_route *api)
 
 	/* Nexthops. */
 	if (CHECK_FLAG(api->message, ZAPI_MESSAGE_NEXTHOP)) {
-		api->nexthop_num = stream_getc(s);
+		api->nexthop_num = stream_getw(s);
 		if (api->nexthop_num > MULTIPATH_NUM) {
 			zlog_warn("%s: invalid number of nexthops (%u)",
 				  __func__, api->nexthop_num);
diff --git a/lib/zclient.h b/lib/zclient.h
index bae52a441b..7c4780201e 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -242,7 +242,7 @@ struct zapi_route {
 	struct prefix prefix;
 	struct prefix_ipv6 src_prefix;
 
-	u_char nexthop_num;
+	u_int16_t nexthop_num;
 	struct zapi_nexthop nexthops[MULTIPATH_NUM];
 
 	u_char distance;