The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=231092bb6fda75b922fc324edef6523e78e9e8ed
commit 231092bb6fda75b922fc324edef6523e78e9e8ed Author: Mike Karels <[email protected]> AuthorDate: 2022-07-02 16:03:36 +0000 Commit: Mike Karels <[email protected]> CommitDate: 2022-07-06 12:12:16 +0000 netstat -i: do not truncate interface names The field for interface names for netstat -i was 5 characters by default, which is no longer sufficient with names like "vlan1234" and "vtnet0". netstat -iW computed the necessary field width, but also enlarged the address field by a lot (especially with IPv6 enabled). Make netstat -i compute the field width for interface names with or without -W. Note that the existing default output does not fit in 80 columns in any case. Update the man page accordingly, documenting the remaining effect of -W with -i. Also add -W to the list of General Options, as there are numerous pointers to this. Reported by: Chris Ross Reviewed by: melifaro, rgrimes, cy Differential Revision: https://reviews.freebsd.org/D35703 MFC after: 1 week --- usr.bin/netstat/if.c | 26 +++++++++++++------------- usr.bin/netstat/netstat.1 | 8 +++++++- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index d9a7574c9e22..5ba4f3afc67b 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -284,20 +284,20 @@ intpr(void (*pfunc)(char *), int af) if (aflag && getifmaddrs(&ifmap) != 0) err(EX_OSERR, "getifmaddrs"); + for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + if (interface != NULL && + strcmp(ifa->ifa_name, interface) != 0) + continue; + if (af != AF_UNSPEC && ifa->ifa_addr->sa_family != af) + continue; + ifn_len = strlen(ifa->ifa_name); + if ((ifa->ifa_flags & IFF_UP) == 0) + ++ifn_len; + ifn_len_max = MAX(ifn_len_max, ifn_len); + if (ifa->ifa_addr->sa_family == AF_INET6) + has_ipv6 = 1; + } if (Wflag) { - for (ifa = ifap; ifa; ifa = ifa->ifa_next) { - if (interface != NULL && - strcmp(ifa->ifa_name, interface) != 0) - continue; - if (af != AF_UNSPEC && ifa->ifa_addr->sa_family != af) - continue; - ifn_len = strlen(ifa->ifa_name); - if ((ifa->ifa_flags & IFF_UP) == 0) - ++ifn_len; - ifn_len_max = MAX(ifn_len_max, ifn_len); - if (ifa->ifa_addr->sa_family == AF_INET6) - has_ipv6 = 1; - } if (has_ipv6) { net_len = 24; addr_len = 39; diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index 0907b5bc7a9f..d02e3c1299dd 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -309,7 +309,8 @@ Do not resolve numeric addresses and port numbers to names. See .Sx GENERAL OPTIONS . .It Fl W -Avoid truncating interface names even if this causes some fields to overflow. +Avoid truncating addresses even if this causes some fields to overflow. +See .Sx GENERAL OPTIONS . .It Fl f Ar protocol_family Filter by @@ -795,6 +796,11 @@ Normally .Nm attempts to resolve addresses and ports, and display them symbolically. +.It Fl W +Wider output; expand address fields, etc, to avoid truncation. +Non-numeric values such as domain names may still be truncated; use the +.Fl n +option if necessary to avoid ambiguity. .El .Sh EXAMPLES Show packet traffic information (packets, bytes, errors, packet drops, etc) for
