From nobody Wed Jul 6 12:16:16 2022 X-Original-To: dev-commits-src-all@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 041561D0D812; Wed, 6 Jul 2022 12:16:17 +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 4LdJRh6gd3z3rPj; Wed, 6 Jul 2022 12:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657109776; 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=0RCyIlTb7vef0uSuS/YvxKDa/5UpK9fZjJiawnaRMSY=; b=D1cmUKGBCMuRxbvARLrFTxYRaUGTyu0sl79KSgjQGQsmYUzkveXniaGGwgXx/IDSrAGCgl RiIsd454AClRLU9IQ6UrBN54cPQuQxCv9Sq9EzohrGXTp+r1Pnuwmy/8hbv3k+Z+Yq+CJl +iLLws2XUoijZM3agqj1FOvZW4ri+uKM2YIsgmtMquBYPlXZHPcuu/NF9RYeCrad0/CPsm /TQd9A4/WpixArgUNChYPVN3THa0xTtpqREjZDMzVDEBmm7bg/tIMepcFev7aioWWQsPLf x+uw/oL5hGYbeygHAHnvQFZ6Fs+tYllQJyXi954u3VH66hN7GqELx9QffDZPLA== 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 C07C21A3AF; Wed, 6 Jul 2022 12:16:16 +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 266CGGQS090993; Wed, 6 Jul 2022 12:16:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266CGG0i090992; Wed, 6 Jul 2022 12:16:16 GMT (envelope-from git) Date: Wed, 6 Jul 2022 12:16:16 GMT Message-Id: <202207061216.266CGG0i090992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 231092bb6fda - main - netstat -i: do not truncate interface names List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 231092bb6fda75b922fc324edef6523e78e9e8ed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657109776; 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=0RCyIlTb7vef0uSuS/YvxKDa/5UpK9fZjJiawnaRMSY=; b=f5vphK8KejHqKdwkpz9snWUF1pdZHfmPcFOrHcx0oMdhmN33mbFjOqXOyRazzrDwVCe+U2 DiRkRIsFBeGZQXydeYvmwFf1evU45if6T2QFgs53o73jcwnrVEK4Jv59jfrYp/EftvL3zA rEU+k9T9XE1lP5H57DT2Kde1p8ACWMvR17d9oc1U13iBuDFdOhJmp2tccD0m/CXTfV+H8t NA44WieiroJ/lFAp1T7SLa7ligLTg+JaIDMDucjS4h6lV55Q47GZZ2OBNaVx/0vTIp3khV jrDiKuqsOseWvGWFAWKIx6yzTRHRV18pC2f9q5wzeYh9I4VseFLbVdNnFjWU7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657109776; a=rsa-sha256; cv=none; b=QlxETRB5LGJc9VkZi8cb1fktE6LTMHXUxytpBd8ymT5ZQsaWTiUhzRvGw6H+kDgWgUQ3Zp qs9j5gNkq0j974EQqIBI5mnSHAVIskzwK386GLdXujcCoI2sseGu9ilw5EKJkbACsyITHQ /Cx3WetIu4Wg7O+ur221Z4eaNhQMSr6so7j89e3lnNQPuGy4IdSCHEYM6ErLczwSDxeKL2 6glyi5Rs9KPIXGJ9mD1rFsAaeAB5x48+0UWv5OuwLMcWz9pzk91wmlGqrGA06uoilL9CJ0 49hLFQA5axdCvD4ftTPbyJsSePLq5hsPQio3Xzjbdqhu9StmdTRdai8TxI0IjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=231092bb6fda75b922fc324edef6523e78e9e8ed commit 231092bb6fda75b922fc324edef6523e78e9e8ed Author: Mike Karels AuthorDate: 2022-07-02 16:03:36 +0000 Commit: Mike Karels 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