diff options
author | ume <ume@FreeBSD.org> | 2015-11-06 14:50:23 +0000 |
---|---|---|
committer | ume <ume@FreeBSD.org> | 2015-11-06 14:50:23 +0000 |
commit | 69eae64be28712d61cd4229c47f3c0b7c5318786 (patch) | |
tree | 1ccb66a687e5ea39f8ebfc42b93c819853b5ae4b /usr.bin | |
parent | dd72564d75f331c2bd15bcc2365d9fe8244e836f (diff) | |
download | FreeBSD-src-69eae64be28712d61cd4229c47f3c0b7c5318786.zip FreeBSD-src-69eae64be28712d61cd4229c47f3c0b7c5318786.tar.gz |
Do not truncate addresses when printing in encoded format.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/netstat/if.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index b827232..f2f689d 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -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; |