From nobody Sun Sep 22 13:24:45 2024 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 4XBRgK3BKWz5XCXv; Sun, 22 Sep 2024 13:24:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XBRgK1Trzz4KZ0; Sun, 22 Sep 2024 13:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727011485; 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=/LWEA7wkVklCtI5cQfHrcCXnwVh6P/Ju1VHBvuB+fdc=; b=TYgKT+WOeOextSLIoClGdeWY5YXfGKM7C6Pxs9oCgj0TMUZcycA1WCtX1YkzbJRspRgiuh jjOeNmlzjJ6yzu+ca3kEynV8A7n7mej/84rFMhw0MnoprftH7qACTy4LvqE1ryejQ2KuW3 QRX7h9s/SN4B/s2RpkJSpMaNgirtc0OXsvug2rekao4xBDkrPTxJ1C0Pez1woZJEbR9WEa UVvcMOPQFwLNi7Xn43UL/odaGsbeQhd20PqLtv/z9jwC8JRJKsjGr9FN0/AYjYwz9MZnCh jwo0W5QGcoHbo93/lGKYU3HU9LqPgoWCjDEFovbRGYUaCdVvaGVuLXw8KoUoYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727011485; a=rsa-sha256; cv=none; b=eE0rfrWmfaIdlp/jvCjIpUXRIiO110qwiW4bC6xwlnbR2hpukYv3XOaTqB3ApVbvZlTlCM RPb2sEURG55uhiNiaGmiORJiCTH5uRHyWck3hlPM0pF7ByVA31jkgvOVE7sAvS+OM1Ea71 jHGA6EpEogR4cVgTdFajxJ/RjJxNv5ZqQIAML5tCMFl/IdR739Z07Ik5ABzis1VjnNTfvf t4VTVE7lNSOuvNUDPLXBjNKql4x3Rq+3k7In4zjipf3VZPm7FQWIyRndK6W06PQSWLf6ds uliZ7OKB8XA3u7NVRcV4pQYPxFsqlbbNcjr1mPuyCwiEKXkcNpvnTVO7MRALWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727011485; 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=/LWEA7wkVklCtI5cQfHrcCXnwVh6P/Ju1VHBvuB+fdc=; b=N5m+rOcyyuDygM0G6cuIVZhzkP8HXIY/zXaCGHQ8Twy213i27axztwR0dYwMxbLn89YtgF Gx84cNaGUh6NYSnu53pQ+qNeWL1cJuM8vyzGWQ3u01cZHVKRx46MuSOVWCNwlEX+GaEU0j x2tnr13k8Ero1IpLpIVhZTrV3fvC7Emo/OcZoASWVmk0rUKBRGeoFvd02NFXzuZBuMBWHl YRgPOjl2AAhL8SsdERhhsd1XAxBlN8zQD4r788mNOG4ey3UamOosVctnbhkFKaRqaMha66 QJ6RxCix41qEEp0uTjcDwtcb+ag3YMWaFXrIdrlw3bofKIhK74fwiKARHMoVVA== 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 4XBRgK16C4z1HJw; Sun, 22 Sep 2024 13:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48MDOjti093190; Sun, 22 Sep 2024 13:24:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48MDOjiH093187; Sun, 22 Sep 2024 13:24:45 GMT (envelope-from git) Date: Sun, 22 Sep 2024 13:24:45 GMT Message-Id: <202409221324.48MDOjiH093187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d00827a9ca0b - main - Revert "netstat: Resolve duplicate "dropped-packets" key from libxo output" 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d00827a9ca0b4f1838b8671859c52c852c6a2727 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d00827a9ca0b4f1838b8671859c52c852c6a2727 commit d00827a9ca0b4f1838b8671859c52c852c6a2727 Author: Warner Losh AuthorDate: 2024-09-22 13:21:07 +0000 Commit: Warner Losh CommitDate: 2024-09-22 13:23:10 +0000 Revert "netstat: Resolve duplicate "dropped-packets" key from libxo output" This reverts commit 94567c8641e235763b5b2926416d89d36654cde1. This breaks normal netstat output. It's kinda tricky to do a quick fix on, so revert this until that can be fixed. If via github, please open a new pull request... Sponsored by: Netflix Pull Request: https://github.com/freebsd/freebsd-src/pull/1331 --- usr.bin/netstat/if.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 877c7aa8dd5e..172ea5324ccb 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -501,11 +501,8 @@ intpr(void (*pfunc)(char *), int af) IFA_STAT(ipackets), link|network, 1); show_stat("lu", nerr_len, "received-errors", IFA_STAT(ierrors), link, 1); - /* Below is kept for backwards compatibility. Will be removed before FreeBSD 16. */ show_stat("lu", nerr_len, "dropped-packets", IFA_STAT(iqdrops), link, 1); - show_stat("lu", nerr_len, "dropped-packets-in", IFA_STAT(iqdrops), - link, 1); if (bflag) show_stat("lu", nbyte_len, "received-bytes", IFA_STAT(ibytes), link|network, 0); @@ -519,7 +516,7 @@ intpr(void (*pfunc)(char *), int af) show_stat("NRSlu", nerr_len, "collisions", IFA_STAT(collisions), link, 1); if (dflag) - show_stat("LSlu", nerr_len, "dropped-packets-out", + show_stat("LSlu", nerr_len, "dropped-packets", IFA_STAT(oqdrops), link, 1); xo_emit("\n"); @@ -708,11 +705,8 @@ loop: new->ift_ip - old->ift_ip, 1, 1); show_stat("lu", 5, "received-errors", new->ift_ie - old->ift_ie, 1, 1); - /* Below is kept for backwards compatibility. Will be removed before FreeBSD 16. */ show_stat("lu", 5, "dropped-packets", new->ift_id - old->ift_id, 1, 1); - show_stat("lu", 5, "dropped-packets-in", - new->ift_id - old->ift_id, 1, 1); show_stat("lu", 10, "received-bytes", new->ift_ib - old->ift_ib, 1, 0); show_stat("lu", 10, "sent-packets", @@ -724,7 +718,7 @@ loop: show_stat("NRSlu", 5, "collisions", new->ift_co - old->ift_co, 1, 1); if (dflag) - show_stat("LSlu", 5, "dropped-packets-out", + show_stat("LSlu", 5, "dropped-packets", new->ift_od - old->ift_od, 1, 1); xo_close_instance("stats"); xo_emit("\n");