From nobody Fri Sep 20 15:58:11 2024 X-Original-To: dev-commits-src-main@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 4X9H9H6X56z5Xfxr; Fri, 20 Sep 2024 15:58:11 +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 4X9H9H57mPz4f04; Fri, 20 Sep 2024 15:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726847891; 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=3AxjV/9Yae4IyAxzxGmIIwWH/TtAJvsQEwHb0oyJYiM=; b=JkVrUl9w0c7WWRcuHXeR/T13mL6GmoKkP6pigaNK7NwpG9MZhlVU7RVTbfSiOXY8kxXBBJ noP0q9BKBECa2Rt3XKcpW/IrCyoySQ/kiYx0RCsWw8NaOL2AX5NqmZlvHanOpAkRpU+ao2 bMRUB2n+S+DuHn66XWgjytC/0e35ryfTWyB6BCOcW5r6YohWnH0kpb0HIwA4PZo6WHI1yh rL/Ws5/pcJ9vf8d5xHkGPhpYDnXujEOQAXIPGA3WgjJI4MYBLZULBveMP9RnZTg5TTxQgM kij0qmFYFXrh4TFrcMMABd32rIBQonEftsH9VWurRiISU8EmxMjf3EVlHVIrlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726847891; a=rsa-sha256; cv=none; b=sWU2XMMxgul0l3VVe9igEQ4CRXo65Oc1vIWbzP2JhIL6A8cSMACve8GCLWl9kF9wPjP8nz V1A3YgojkQhGYvCgmnck30AAaQ8FBsLmTjfFojKsGd/Id3QbcA0SElHPQuO8XeeTqxEEbl nh6e8/pQZVWkUsXW3xiNZ2Nwm+MpwDRtn1OEsdBEN4sUdMBDkJTZ843z5dbbVhxt2zt1zA NkrnxvvAG9ZdJi01I6S1YywVi+8bT0T+841WQOhzobB79eO9gnRWyLMXx5YZ85hDHecVDr kgIVofu582N0ulQXySuTOUacK3S9M5lKvzWbZxKuYqb3WdtUxNvwf+IFu2jwbQ== 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=1726847891; 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=3AxjV/9Yae4IyAxzxGmIIwWH/TtAJvsQEwHb0oyJYiM=; b=JaxhzMOY21E1qOOwA5EOLCVa+3vR1jTTHZ42lUJGbDpOuTeI88ckVcfMWu4PH485TxH63T 4g+5ll27FRzFhxod2Uln0fawb8JfdX5ZAIasFqVcMaMbHDu6oU0mV1CkWAspdcy995NYiC dKwmn8BY/VTV/3JDmGL8CyiELMV8HZt07wP3ZbGxod2DaPsoiGrVGO8G+FS4XekApfXIKt DT9TCvuNC61XusQhiJRbmuCgLUqdixSw1lXRz4CPLKCgg8Ahvoy9mBiZqcNgOnL0aIpEBf sg8w/3XqbxhY4M2mX8zET3wrUG4NCZ4ap7qKd+hGDH5zsZbiBWe46K4gzGO3jA== 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 4X9H9H2xnGzwc9; Fri, 20 Sep 2024 15:58:11 +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 48KFwBqs048895; Fri, 20 Sep 2024 15:58:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KFwBi4048892; Fri, 20 Sep 2024 15:58:11 GMT (envelope-from git) Date: Fri, 20 Sep 2024 15:58:11 GMT Message-Id: <202409201558.48KFwBi4048892@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: 674b96f58b9c - main - netstat: Add missing "shutdown-ack-timer" key to libxo output List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 674b96f58b9c7daabb53ba3180afe4fc26354e27 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=674b96f58b9c7daabb53ba3180afe4fc26354e27 commit 674b96f58b9c7daabb53ba3180afe4fc26354e27 Author: Bram AuthorDate: 2024-07-23 09:05:13 +0000 Commit: Warner Losh CommitDate: 2024-09-20 15:06:50 +0000 netstat: Add missing "shutdown-ack-timer" key to libxo output The key "shutdown-timer" was present twice in the libxo output. The second occurence of "shutdown-time" has been renamed to "shutdown-ack-timer". PR: 254672 Reviewed by: imp, zlei Pull Request: https://github.com/freebsd/freebsd-src/pull/1331 --- usr.bin/netstat/if.c | 4 ++-- usr.bin/netstat/sctp.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index f0af785bce04..877c7aa8dd5e 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -501,7 +501,7 @@ 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 in the future. */ + /* 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), @@ -708,7 +708,7 @@ 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 in the future. */ + /* 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", diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c index 92c4bf67b2fa..e9fd494e292b 100644 --- a/usr.bin/netstat/sctp.c +++ b/usr.bin/netstat/sctp.c @@ -711,7 +711,7 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused) "secret\n"); p(sctps_timopathmtu, "\t\t{:pmtu-timer/%ju} " "{N:/PMTU timer%s fired}\n"); - p(sctps_timoshutdownack, "\t\t{:shutdown-timer/%ju} " + p(sctps_timoshutdownack, "\t\t{:shutdown-ack-timer/%ju} " "{N:/shutdown ack timer%s fired}\n"); p(sctps_timoshutdownguard, "\t\t{:shutdown-guard-timer/%ju} " "{N:/shutdown guard timer%s fired}\n");