From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 11 Dec 2017 13:48:59 +0000 (-0500)
Subject: bgpd: Modify prefix_rd2str to return "Unknown" when unknown
X-Git-Tag: frr-4.0-dev~97^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=02d3243970db013f51a95f93de986f338329f2ac;p=matthieu%2Ffrr.git

bgpd: Modify prefix_rd2str to return "Unknown" when unknown

Make prefix_rd2str return an "Unknown" string when something
goes wrong.  This will allow for simplification of the
code that uses prefix_rd2str.

Additionally ensure that size is big enough with an assert.

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

diff --git a/bgpd/bgp_rd.c b/bgpd/bgp_rd.c
index 2b676e052b..ae1ec7b845 100644
--- a/bgpd/bgp_rd.c
+++ b/bgpd/bgp_rd.c
@@ -166,8 +166,7 @@ char *prefix_rd2str(struct prefix_rd *prd, char *buf, size_t size)
 	struct rd_as rd_as;
 	struct rd_ip rd_ip;
 
-	if (size < RD_ADDRSTRLEN)
-		return NULL;
+	assert(size >= RD_ADDRSTRLEN);
 
 	pnt = prd->val;
 
@@ -197,5 +196,7 @@ char *prefix_rd2str(struct prefix_rd *prd, char *buf, size_t size)
 		return buf;
 	}
 #endif
-	return NULL;
+
+	snprintf(buf, size, "Unknown Type: %d", type);
+	return buf;
 }