From nobody Wed Jul 13 13:23:30 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BB4AC17FDEEC; Wed, 13 Jul 2022 13:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ljdc24ygdz44ls; Wed, 13 Jul 2022 13:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657718610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HogG1TpfD0h2sXFS7g7WRQKDWWiP52EiKW2I1jXZffw=; b=hBheFCC7PzIchOIwLfdB8sjXP8N/CFCjYmCybdu80wCJrFN955R5FXHljZKm+r/IESxxwR 4cU5ffnmWFSWwQN7xuUkDQ6b5H7dLqle42r0RZpmqUIP5aPXl2P4RCzl8RmaeyivybGkH3 M7srj8K84TkRwqWQF+gVgaY1RfEsf7OT3szTYu7AN/4V7R8y9LPgQY8aMUn/sUFjNa2q7F lBDl8YKwBpXAb9abycws8cR+0eXgg6Bl+TJqMVwRO68SZgHm7I9UboV4JL7njXGI9fp4ud Y4/nBVVeI6laO66MZOA68u7LUeB+XGoQ9izugTRHl5Xp05p+/AJkFnTWboF4Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ljdc241SjzPjX; Wed, 13 Jul 2022 13:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26DDNUXQ080386; Wed, 13 Jul 2022 13:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DDNUvH080385; Wed, 13 Jul 2022 13:23:30 GMT (envelope-from git) Date: Wed, 13 Jul 2022 13:23:30 GMT Message-Id: <202207131323.26DDNUvH080385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 4cd1e685e823 - stable/12 - netstat -i: do not truncate interface names List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 4cd1e685e8232c4b13552363b16f8531cb32d450 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657718610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HogG1TpfD0h2sXFS7g7WRQKDWWiP52EiKW2I1jXZffw=; b=lE3oe5cSvteJb9mus1tF4VPGn6kX/xPA3MNNEEcWaMwi3LVaxLttGgDp5b9Lztlf+4HFdx eeqymswrs4mwWicJkADV1Ws/UVqlcFfDsX3orJ0XsKOYZJeWR0OSMHH80rJYN9qPhS+mC/ qXdPXFe/q0w85sOJ+lX5RR/zsu5iD7I9As8s0lM9TfwWK/MKDfOFFN+6gCGeNd/2yb1u3d yow+/htT/Z1gyZQnZRb4+F01nwvXsrpl3jfFhmMIgCmRT3h+wQnTevcanjZu0ZKyqpGqOm zgzsQ49UFZrgAE0VXsqUtdXliMmrUuymZ7b4GGyDbaRBG2TaKwsKkgA/zyh8WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657718610; a=rsa-sha256; cv=none; b=Cdlo6NGhB4S1g+IY80nQHjTyic2cs4SzG+PNXmGn4tGv+WHJULGpIkS7MIxlP7CLsXxNU7 m1j+j9xEI+HV8WRxhFDkjwNdUG1gQFIQSHPAgq95DM2RDDjt3tjBLGE25p6b9P+YbEwNHy NlyPDWw2/1lvPsSamW0LOQ4z3ySO3P76GpvZcp5L/7i0sr+4haCgFMVTlPCaf3H5BFqrCH Eyj44QtQ5Ssrr+unDiEviQCIL2axitfh+qASETYv71TkCNYWei9w74JM/LDgCqtkZ7hy9E qGnQ9ZweNlq9NPAC3bhnhqvGiteGkOtggI/tUjkWpDOnlCxQ8HBhigUZ3h/LUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=4cd1e685e8232c4b13552363b16f8531cb32d450 commit 4cd1e685e8232c4b13552363b16f8531cb32d450 Author: Mike Karels AuthorDate: 2022-07-02 16:03:36 +0000 Commit: Mike Karels CommitDate: 2022-07-13 13:23:13 +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 (cherry picked from commit 231092bb6fda75b922fc324edef6523e78e9e8ed) --- 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 b2ef71da93af..a675afa17f61 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -314,7 +314,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 @@ -801,6 +802,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 SEE ALSO .Xr fstat 1 ,