From nobody Thu Apr 20 22:06:28 2023 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 4Q2Wvm4lTNz46frY; Thu, 20 Apr 2023 22:06:28 +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 4Q2Wvm405qz3PRT; Thu, 20 Apr 2023 22:06:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682028388; 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=rBo1f02/G37l8I9HLxzuQe7Xa7Wo40UjAUvqGIgZVnc=; b=k+x5I95Tkzj88Eor0wsCIzhrv1HUw5MDeoBdQGHIQghy/azYWaCzCy3BQpw88l98fFdB5O Pufr8DrBGUCnspDkhilrJcxQ+FyEerleyxdp5YqUvRQhXkpKERXJzCQ5h5lQTSH0NwqJ27 Kn4K4RPZimo2yHW/qte2D31alHnO966bwDj3dT6y0Zt0qydoaHPYHWH/Acevl9bFgKeiKs U78w/y8XiV57tPe6FbmAmYjdE/i+daFNFQ7H0HTt9/6i6qllZ8JoT0UR/8wuRUhL3EAMGm u3YXbTeZPeUy53BA7WBUcqwTGcPoQdZsMiuQ/id8o5DfrBF7/Ok8hEDUd1b4ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682028388; 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=rBo1f02/G37l8I9HLxzuQe7Xa7Wo40UjAUvqGIgZVnc=; b=NQjWQcEFtuOuFvhrowr38ynlYfBZs006NYN++vw490uEEXquNzlxVR3DG1ce/XN+E/QdT1 hfb1bT3BysIzyIcfHJnvX/2uC3GnElN4erjkuJD668kcgJXYNGgFFklz43aaepDwFnTymg e7i4E7Nj2QwrBorXY2uSIk2UCZ0I8lrmnsk2JufQkTsDTuXsvXsDDLK+dDxzhbUWfRf1PM ++CX9xqPrfpQMF6hBM7LH3uwWQbl7Uhd03QgkVPfQPQjWi/DyssbjQvD1WiUY83zgabUUc a4P28V4iGZBVcjUlEY+Ov5wWW0A+GcQ8OOhFRby6lQOZmpVcV8Kua7s9WL4H5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682028388; a=rsa-sha256; cv=none; b=mf19HfalXPIwgahmtoOW9C6btmQ1CRnHFZbl2108g9l9Fvx9T1EqA5Jwk7JeC8xlJ+fm9A e5AbJAki6gC77A6SL/rhRlhrHF93cPsu7hQtHRj27wtre0tzIOlVLNQhvWrMsOzmsw5N1J ir+tebibTsTKuCUKdSJTIewYKiITzGbe1BOG9QK6++mfyXGlQDo+GaZCOTMZm9luoWzD7S a/5+xsciX54dbzQMeCU6FfqvEhycxtdEFkCYVKNNSAOGKNlwvhdHezqfc1Ld5/lp4qhH/2 bpZwKDA+7suUn3ADpw+Eusp21lzkydWpC34S2SU0bL/kjrrvFCOHCbSoni9+7Q== 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 4Q2Wvm2yJyzvss; Thu, 20 Apr 2023 22:06:28 +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 33KM6S16024294; Thu, 20 Apr 2023 22:06:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KM6SnO024293; Thu, 20 Apr 2023 22:06:28 GMT (envelope-from git) Date: Thu, 20 Apr 2023 22:06:28 GMT Message-Id: <202304202206.33KM6SnO024293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: ddf24a507c1a - main - netstat: cleanup 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddf24a507c1a7509d9657e477e69f1e7d08c77a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ddf24a507c1a7509d9657e477e69f1e7d08c77a6 commit ddf24a507c1a7509d9657e477e69f1e7d08c77a6 Author: Michael Tuexen AuthorDate: 2023-04-20 21:52:19 +0000 Commit: Michael Tuexen CommitDate: 2023-04-20 21:52:19 +0000 netstat: cleanup protopr does not support reading from a core anymore. So don't state that it can. Reviewed by: glebius, rscheff, rrs MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D39688 --- usr.bin/netstat/main.c | 22 +++++++++++----------- usr.bin/netstat/nlist_symbols | 4 ---- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index 078d8cca3c61..f0db6409f1eb 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -88,9 +88,9 @@ static struct protox { int pr_usesysctl; /* non-zero if we use sysctl, not kvm */ int pr_protocol; } protox[] = { - { N_TCBINFO, N_TCPSTAT, 1, protopr, + { -1 , N_TCPSTAT, 1, protopr, tcp_stats, NULL, "tcp", 1, IPPROTO_TCP }, - { N_UDBINFO, N_UDPSTAT, 1, protopr, + { -1 , N_UDPSTAT, 1, protopr, udp_stats, NULL, "udp", 1, IPPROTO_UDP }, #ifdef SCTP { -1, N_SCTPSTAT, 1, sctp_protopr, @@ -100,13 +100,13 @@ static struct protox { { -1, -1, 1, protopr, NULL, NULL, "sdp", 1, IPPROTO_TCP }, #endif - { N_DIVCBINFO, -1, 1, protopr, + { -1 , -1, 1, protopr, divert_stats, NULL, "divert", 1, 0 }, - { N_RIPCBINFO, N_IPSTAT, 1, protopr, + { -1 , N_IPSTAT, 1, protopr, ip_stats, NULL, "ip", 1, IPPROTO_RAW }, - { N_RIPCBINFO, N_ICMPSTAT, 1, protopr, + { -1 , N_ICMPSTAT, 1, protopr, icmp_stats, NULL, "icmp", 1, IPPROTO_ICMP }, - { N_RIPCBINFO, N_IGMPSTAT, 1, protopr, + { -1 , N_IGMPSTAT, 1, protopr, igmp_stats, NULL, "igmp", 1, IPPROTO_IGMP }, #ifdef IPSEC { -1, N_IPSEC4STAT, 1, NULL, /* keep as compat */ @@ -118,7 +118,7 @@ static struct protox { { -1, N_IPCOMPSTAT, 1, NULL, ipcomp_stats, NULL, "ipcomp", 1, 0}, #endif - { N_RIPCBINFO, N_PIMSTAT, 1, protopr, + { -1 , N_PIMSTAT, 1, protopr, pim_stats, NULL, "pim", 1, IPPROTO_PIM }, { -1, N_CARPSTATS, 1, NULL, carp_stats, NULL, "carp", 1, 0 }, @@ -134,13 +134,13 @@ static struct protox { #ifdef INET6 static struct protox ip6protox[] = { - { N_TCBINFO, N_TCPSTAT, 1, protopr, + { -1 , N_TCPSTAT, 1, protopr, tcp_stats, NULL, "tcp", 1, IPPROTO_TCP }, - { N_UDBINFO, N_UDPSTAT, 1, protopr, + { -1 , N_UDPSTAT, 1, protopr, udp_stats, NULL, "udp", 1, IPPROTO_UDP }, - { N_RIPCBINFO, N_IP6STAT, 1, protopr, + { -1 , N_IP6STAT, 1, protopr, ip6_stats, ip6_ifstats, "ip6", 1, IPPROTO_RAW }, - { N_RIPCBINFO, N_ICMP6STAT, 1, protopr, + { -1 , N_ICMP6STAT, 1, protopr, icmp6_stats, icmp6_ifstats, "icmp6", 1, IPPROTO_ICMPV6 }, #ifdef SDP { -1, -1, 1, protopr, diff --git a/usr.bin/netstat/nlist_symbols b/usr.bin/netstat/nlist_symbols index 1c09d81c0b98..3583887ad9d7 100644 --- a/usr.bin/netstat/nlist_symbols +++ b/usr.bin/netstat/nlist_symbols @@ -4,7 +4,6 @@ all _ahstat all _arpstat all _carpstats -all _divcbinfo all _espstat all _icmp6stat all _icmpstat @@ -36,15 +35,12 @@ all _pfsyncstats all _pim6stat all _pimstat all _rip6stat -all _ripcbinfo all _rtree all _rtstat all _sctpstat all _sfstat -all _tcbinfo all _tcpstat all _tcps_states -all _udbinfo all _udpstat all _unp_count all _unp_dhead