From nobody Wed Sep 11 10:09:10 2024 X-Original-To: dev-commits-src-branches@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 4X3brk3hmHz5WJc5; Wed, 11 Sep 2024 10:09:10 +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 4X3brk2xQNz4Mxn; Wed, 11 Sep 2024 10:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726049350; 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=H09vazdN98BLt0Mcyo+QRHOqONRfFkbiWaj18NdPQiY=; b=NEkEvN/G/s5QfRYviZ7c3xuO5wS+FEs084fRX9tb6lJlfcuLVMK/YO/4poHKImYFa1/4j2 mZqvZeNQF8+8eXUYejf1b6ISHuIm+TNVBHX0qIfmeHk53ilQtgUvT8ltW+aWmALP2nTjni Cdjb71GVVml/U30IXK042L1vM8lSEVVnT6rpo7ehrj+HRGGcvw6breQUmk+aiuWJaGgfny qLkqnxSJ95PmS5yMjxpFIfEZVQhn2bbyKX5jvBJCo1NQWyqxwNs7qm32BaQEtIfsod58n9 1ZsVVulEjMXXupsvcOhwj/pxuTVC/chrCYft560nUBlZxGQ2V14W4lJJPBa19g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726049350; a=rsa-sha256; cv=none; b=cHY+ifiYWdw0wwG5zywIwOoOZhYfCYrtzTd5vjJ3Itx+vrYik7ERx3V8WSYdvT5dbs2erO WI/kUSqwFhwsyYcPEtuO/kHOZ98kBZuRDoGBRBh73qYwayt2cYRJ0nmNDjYThK0spGrsOc JFVr2dwti3lfDECf/STHoxLCYfBSoOULd/fZJZXh0NGyTu+hLxtgD76cigqwVz8p26zHcC SZza/GHEbp0hdTd89n2KojtIZR1znh0pMA5e/vl2hGt5ikMByXBafOLOhL1VrCRUl7JqWh Yy/giZQnkd3baloYUkRc6sucrQIFgD0wBGRy9ATfAn9UBUN7e6BHgxBnlMEMQQ== 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=1726049350; 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=H09vazdN98BLt0Mcyo+QRHOqONRfFkbiWaj18NdPQiY=; b=IDoYj9tEiWpOdU8HT0JmHvSU3/QA2nIVs3k9d64QAP3AcudYFaFfnMtXAnDSMdkovNZAlG N4PMGnO16A8ccVGnRdm+sbkGwgsaC/uFGvcgwWRmyZtXfzn+dQCALm54qmeWH92F9qVFtM P2kKp2So9UOQzY+WIxDHNshL3cqHGg7kbwGZOSKGoYbX2/SELZIdmssRnxToU74lGzllgW dBUAu0m4DePgvrJeVzysIyBCMgSghMXZH2AeaTK3qQAqtqEP0MlcrnpPo/29lJnDOccWiY IkNKoOjp3HLJBPPAMzIVYbULFeTWYVjIauFJWMpM/h2N2h2Adnp1TPw58YGogQ== 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 4X3brk2PlvzRPX; Wed, 11 Sep 2024 10:09:10 +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 48BA9AOX046094; Wed, 11 Sep 2024 10:09:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48BA9Aei046091; Wed, 11 Sep 2024 10:09:10 GMT (envelope-from git) Date: Wed, 11 Sep 2024 10:09:10 GMT Message-Id: <202409111009.48BA9Aei046091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 818a8f2ef344 - stable/13 - ndp: Fix libxo formatting for the header of neighbor cache List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 818a8f2ef34408e2e85d9317e67492fa165bd98a Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=818a8f2ef34408e2e85d9317e67492fa165bd98a commit 818a8f2ef34408e2e85d9317e67492fa165bd98a Author: Helge Oldach AuthorDate: 2024-09-02 10:12:43 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-11 10:07:48 +0000 ndp: Fix libxo formatting for the header of neighbor cache PR: 272749 Reviewed by: zlei Fixes: e1c7783e220b ndp(8): add structured output formatting via libxo MFC after: 3 days (Note this is only a partial MFS, as the netlink part was not MFS'ed) (cherry picked from commit 209905ec384eedd58f1b9b7ab774029d22787dfb) (cherry picked from commit 07cf1ce012c51e30ef5078c23a7d68a9b5d87c0a) --- usr.sbin/ndp/ndp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 425afdca56f6..c826fb8d241f 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -598,7 +598,7 @@ dump(struct sockaddr_in6 *addr, int cflag) if (!tflag && !cflag) { char xobuf[200]; snprintf(xobuf, sizeof(xobuf), - "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:%%1s} {T:%%5s}\n", + "{T:/%%-%d.%ds} {T:/%%-%d.%ds} {T:/%%%d.%ds} {T:/%%-9.9s} {T:/%%1s} {T:/%%5s}\n", W_ADDR, W_ADDR, W_LL, W_LL, W_IF, W_IF); xo_emit(xobuf, "Neighbor", "Linklayer Address", "Netif", "Expire", "S", "Flags"); }