Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	lib/.gitignore
	lib/command.c
	lib/command.h

1 files changed, 33 insertions, 0 deletions

diff --git a/lib/nexthop.c b/lib/nexthop.c
index 5853884218..14486ea157 100644
--- a/lib/nexthop.c
+++ b/lib/nexthop.c
@@ -153,3 +153,36 @@ nexthops_free (struct nexthop *nexthop)
       nexthop_free (nh);
     }
 }
+
+const char *
+nexthop2str (struct nexthop *nexthop, char *str, int size)
+{
+  switch (nexthop->type)
+    {
+      case NEXTHOP_TYPE_IFINDEX:
+        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);
+        break;
+      case NEXTHOP_TYPE_BLACKHOLE:
+        snprintf (str, size, "blackhole");
+        break;
+      default:
+        snprintf (str, size, "unknown");
+        break;
+    }
+
+  return str;
+}