From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 30 Nov 2018 21:07:34 +0000 (-0500)
Subject: lib: Cleanup nexthop2str code to be consistent
X-Git-Tag: frr-7.1-dev~135^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1d74ea6ea0cf427185438f46ff44bd08e0835f9a;p=matthieu%2Ffrr.git

lib: Cleanup nexthop2str code to be consistent

We sometimes store ifindex information in the NEXTHOP_TYPE_IPV[4|6]
so let's let us display that information as well when dumping
a nexthop.

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

diff --git a/lib/nexthop.c b/lib/nexthop.c
index 3603050f06..d25b470277 100644
--- a/lib/nexthop.c
+++ b/lib/nexthop.c
@@ -248,15 +248,11 @@ const char *nexthop2str(const struct nexthop *nexthop, char *str, int size)
 		snprintf(str, size, "if %u", nexthop->ifindex);
 		break;
 	case NEXTHOP_TYPE_IPV4:
-		snprintf(str, size, "%s", inet_ntoa(nexthop->gate.ipv4));
-		break;
 	case NEXTHOP_TYPE_IPV4_IFINDEX:
 		snprintf(str, size, "%s if %u", inet_ntoa(nexthop->gate.ipv4),
 			 nexthop->ifindex);
 		break;
 	case NEXTHOP_TYPE_IPV6:
-		snprintf(str, size, "%s", inet6_ntoa(nexthop->gate.ipv6));
-		break;
 	case NEXTHOP_TYPE_IPV6_IFINDEX:
 		snprintf(str, size, "%s if %u", inet6_ntoa(nexthop->gate.ipv6),
 			 nexthop->ifindex);