d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not truncate addresses when printing in encoded format.

Browse Source
This commit is contained in:
Hajimu UMEMOTO 2015-11-06 14:50:23 +00:00
parent 576aa559db
commit b670e89ac2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=290449
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.bin/netstat/if.c
View File

@ -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;