From 9333d761bc67443a33b97e37945ebc8e4e25704c Mon Sep 17 00:00:00 2001
From: cy <cy@FreeBSD.org>
Date: Thu, 11 May 2017 04:39:11 +0000
Subject: [PATCH] Implement outputting of IPv6 addresses in the ippool debug
 list of tree type pools (ippool -l -d -t tree). Currently IPv6 in ippool tree
 type pool handling is partially implemented (meaning it doesn't work). This
 is the first of a series of commits to remediate ippool.

This will be MFCed with a yet to be committed series of fixes to ippool
after it has been fully remediated.

PR:		218433
---
 contrib/ipfilter/lib/printpoolnode.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/contrib/ipfilter/lib/printpoolnode.c b/contrib/ipfilter/lib/printpoolnode.c
index aa2aed96cad3..95ce8c3a4ed7 100644
--- a/contrib/ipfilter/lib/printpoolnode.c
+++ b/contrib/ipfilter/lib/printpoolnode.c
@@ -33,8 +33,30 @@ printpoolnode(np, opts, fields)
 		printmask(np->ipn_addr.adf_family,
 			  (u_32_t *)&np->ipn_mask.adf_addr);
 	} else {
-		PRINTF("\tAddress: %s%s", np->ipn_info ? "! " : "",
-			inet_ntoa(np->ipn_addr.adf_addr.in4));
+#ifdef AF_INET6
+		if (np->ipn_addr.adf_family == AF_INET6) {
+			char buf[INET6_ADDRSTRLEN + 1];
+			const char *str;
+			
+			buf[0] = '\0';
+			str = inet_ntop(AF_INET6, &np->ipn_addr.adf_addr.in6,
+				buf, sizeof(buf) - 1);
+			if (str == NULL)
+				str = "???";
+			PRINTF("\tAddress: %s%s", np->ipn_info ? "! " : "",
+				str);
+		} else if (np->ipn_addr.adf_family == AF_INET) {
+#else
+		if (np->ipn_addr.adf_family == AF_INET) {
+#endif
+			PRINTF("\tAddress: %s%s", np->ipn_info ? "! " : "",
+				inet_ntoa(np->ipn_addr.adf_addr.in4));
+		} else {
+			PRINTF("\tAddress: family: %d",
+				np->ipn_addr.adf_family);
+#ifdef AF_INET6
+		}
+#endif
 		printmask(np->ipn_addr.adf_family,
 			  (u_32_t *)&np->ipn_mask.adf_addr);
 #ifdef USE_QUAD_T