From owner-svn-src-head@freebsd.org  Fri Nov  6 14:50:24 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A532A28C51;
 Fri,  6 Nov 2015 14:50:24 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5031A1B07;
 Fri,  6 Nov 2015 14:50:24 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA6EoNsG040123;
 Fri, 6 Nov 2015 14:50:23 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA6EoNmG040122;
 Fri, 6 Nov 2015 14:50:23 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201511061450.tA6EoNmG040122@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Fri, 6 Nov 2015 14:50:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290449 - head/usr.bin/netstat
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Nov 2015 14:50:24 -0000

Author: ume
Date: Fri Nov  6 14:50:23 2015
New Revision: 290449
URL: https://svnweb.freebsd.org/changeset/base/290449

Log:
  Do not truncate addresses when printing in encoded format.

Modified:
  head/usr.bin/netstat/if.c

Modified: head/usr.bin/netstat/if.c
==============================================================================
--- head/usr.bin/netstat/if.c	Fri Nov  6 14:40:51 2015	(r290448)
+++ head/usr.bin/netstat/if.c	Fri Nov  6 14:50:23 2015	(r290449)
@@ -324,6 +324,7 @@ intpr(void (*pfunc)(char *), int af)
 	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
 		bool network = false, link = false;
 		char *name, *xname, buf[IFNAMSIZ+1];
+		const char *nn, *rn;
 
 		if (interface != NULL && strcmp(ifa->ifa_name, interface) != 0)
 			continue;
@@ -375,18 +376,18 @@ intpr(void (*pfunc)(char *), int af)
 #ifdef INET6
 		case AF_INET6:
 #endif /* INET6 */
+			nn = netname(ifa->ifa_addr, ifa->ifa_netmask);
+			rn = routename(ifa->ifa_addr, numeric_addr);
 			if (Wflag) {
-				xo_emit("{t:network/%-*s} ", net_len,
-				    netname(ifa->ifa_addr, ifa->ifa_netmask));
-				xo_emit("{t:address/%-*s} ", addr_len,
-				    routename(ifa->ifa_addr, numeric_addr));
+				xo_emit("{et:network/%s}{d:/%-*s} ",
+				    nn, net_len, nn);
+				xo_emit("{et:address/%s}{d:/%-*s} ",
+				    rn, addr_len, rn);
 			} else {
-				xo_emit("{t:network/%-*.*s} ",
-				    net_len, net_len,
-				    netname(ifa->ifa_addr, ifa->ifa_netmask));
-				xo_emit("{t:address/%-*.*s} ",
-				    addr_len, addr_len,
-				    routename(ifa->ifa_addr, numeric_addr));
+				xo_emit("{et:network/%s}{d:/%-*.*s} ",
+				    nn, net_len, net_len, nn);
+				xo_emit("{et:address/%s}{d:/%-*.*s} ",
+				    rn, addr_len, addr_len, rn);
 			}
 
 			network = true;