From owner-dev-commits-src-branches@freebsd.org Sun Apr 4 08:44:28 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9DC8E5CFDD8; Sun, 4 Apr 2021 08:44: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 4FCnQh3bJ7z4f5d; Sun, 4 Apr 2021 08:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 69DEA22D08; Sun, 4 Apr 2021 08:44: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 1348iSwU058930; Sun, 4 Apr 2021 08:44:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1348iSQB058929; Sun, 4 Apr 2021 08:44:28 GMT (envelope-from git) Date: Sun, 4 Apr 2021 08:44:28 GMT Message-Id: <202104040844.1348iSQB058929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 1260724822b5 - stable/13 - Fix `netstat -rs` reporting. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1260724822b5830411cbf56d48e997be1628e53b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Apr 2021 08:44:28 -0000 The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=1260724822b5830411cbf56d48e997be1628e53b commit 1260724822b5830411cbf56d48e997be1628e53b Author: Alexander V. Chernikov AuthorDate: 2021-03-31 20:56:26 +0000 Commit: Alexander V. Chernikov CommitDate: 2021-04-04 08:44:01 +0000 Fix `netstat -rs` reporting. rttrash (unused but not yet delete entries) were eliminated during routing rework. Remove reading these symbols from the kernel. PR: 254681 Reported by: rashey@superbox.pl (cherry picked from commit 4084b1ab0413d15dab496b1c24c3875601c71438) --- usr.bin/netstat/nlist_symbols | 1 - usr.bin/netstat/route.c | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/usr.bin/netstat/nlist_symbols b/usr.bin/netstat/nlist_symbols index afad45d353bd..1c09d81c0b98 100644 --- a/usr.bin/netstat/nlist_symbols +++ b/usr.bin/netstat/nlist_symbols @@ -39,7 +39,6 @@ all _rip6stat all _ripcbinfo all _rtree all _rtstat -all _rttrash all _sctpstat all _sfstat all _tcbinfo diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index ba47a4b56ac5..317e3ffb9607 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -699,19 +699,13 @@ void rt_stats(void) { struct rtstat rtstat; - u_long rtsaddr, rttaddr; - int rttrash; + u_long rtsaddr; if ((rtsaddr = nl[N_RTSTAT].n_value) == 0) { xo_emit("{W:rtstat: symbol not in namelist}\n"); return; } - if ((rttaddr = nl[N_RTTRASH].n_value) == 0) { - xo_emit("{W:rttrash: symbol not in namelist}\n"); - return; - } kread_counters(rtsaddr, (char *)&rtstat, sizeof (rtstat)); - kread(rttaddr, (char *)&rttrash, sizeof (rttrash)); xo_emit("{T:routing}:\n"); #define p(f, m) if (rtstat.f || sflag <= 1) \ @@ -728,9 +722,4 @@ rt_stats(void) p(rts_wildcard, "\t{:wildcard-uses/%ju} " "{N:/use%s of a wildcard route}\n"); #undef p - - if (rttrash || sflag <= 1) - xo_emit("\t{:unused-but-not-freed/%u} " - "{N:/route%s not in table but not freed}\n", - rttrash, plural(rttrash)); }