From nobody Mon Sep 02 10:15:56 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 4Wy4Qh2nvZz5PQKb; Mon, 02 Sep 2024 10:15:56 +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 4Wy4Qh1yKDz4MGZ; Mon, 2 Sep 2024 10:15:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725272156; 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=VzptZCq+CmywKLYWVUAOnENmjhkGLR3YzKylF2eAsvc=; b=H1r6GDEaj4KGhypL+r92fPmZohjGEtJXyhvvyccJ4l2kVISKXLfL4BEzda5rjetVopraAf pLqIryEEFKxXl/ZHNulcmnuy8OCfCZojErbCRG00hyTbAIoYfmlfnKqXE0zdlojm7+456l 0unt06xa8bvzEdS5jMy1OAabdzXv7EfgVWGTKFM6uCMQyN4jIC6H0MQvqjgoqsMqPTQUc8 MsyEoNNrLCbj0DVoUqE3m8OXKUYHM3sY4At0ziraDCHKrKaRAkQOBdUF8N/oZ7vbuLcxXr 7eTiGAM8jSOzPa2KB2Z7Wg6f1A5RPlG6XaQZObPNEoQgSMe8lqcTBUVfUiJKxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725272156; a=rsa-sha256; cv=none; b=fKTsgSuCfVz8JUuzdAUnhfC102Bx0YxsDSL9l4rS9HIm26GljlSjaLYv/j/Npff//KBtey SoLMe3W6IAgAG8NcccDIlQCHtGvHuN3WOEcNKvt5y6M/qrvMlkc+uQtsHTpgPzAf3n17nK 6DwBvHvgfsEMyAe/9Rmx1PWLnKWn2rdPsCbn6uaAvQWm49ocMSD2WQ0Qbfb3x/pMOCkKr5 BGqM38CpWaOuudVlGmfTW9A97v3PRDXpjYd/EYaZcnoVP++k1SFZ3oazjo2NZyk+KVv5Uo pIcx1kDygpU4Jug+GFfc4EREHYeSiB93VLkec1USKxlJp6r5CeozGzds3UDKhg== 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=1725272156; 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=VzptZCq+CmywKLYWVUAOnENmjhkGLR3YzKylF2eAsvc=; b=TG8FHXbJpuA8bU+XQXT8015c1zYF4r5ToJr5WONaEXQznZLECHEbgf3ePHGntqAEq03mfr 3NR8tLLh5KvZTLo5ursdroFFBarfJ94BKxMp+dwC/9+3P78Gc/lcINeZWgwILvYbi9oLjE kP8/hm8vC7159SAi1oIdD3OU7c3oVj48S2lUeImdp3c3MhTF9ImZBZwdzCeaezx9cfvVDF FzmGNm6Qv1i5ZonIHsCVm2cOWFJoBEs3iYIGrSQj3QEQj3JvfN/0STQygSfvb2O7WfcO4x DXGBPGfew0gwlcVD6+XfGvaW5UnhXCPPawC6by4nQR1ll4XvZ10gwJ/vu1Bgnw== 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 4Wy4Qh1Xnvz175m; Mon, 2 Sep 2024 10:15:56 +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 482AFurR052361; Mon, 2 Sep 2024 10:15:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 482AFuQU052358; Mon, 2 Sep 2024 10:15:56 GMT (envelope-from git) Date: Mon, 2 Sep 2024 10:15:56 GMT Message-Id: <202409021015.482AFuQU052358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 209905ec384e - main - ndp: Fix libxo formatting for the header of neighbor cache 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 209905ec384eedd58f1b9b7ab774029d22787dfb Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=209905ec384eedd58f1b9b7ab774029d22787dfb commit 209905ec384eedd58f1b9b7ab774029d22787dfb Author: Helge Oldach AuthorDate: 2024-09-02 10:12:43 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-02 10:15:15 +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 Fixes: 91fbe0819bb9 ndp: convert ndp(8) to netlink MFC after: 3 days --- usr.sbin/ndp/ndp.c | 2 +- usr.sbin/ndp/ndp_netlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 637aac2823ed..7c7bc60451c8 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -633,7 +633,7 @@ dump_rtsock(struct sockaddr_in6 *addr, int cflag) if (!opts.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"); } diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c index e18d64175619..bafa9f2a143d 100644 --- a/usr.sbin/ndp/ndp_netlink.c +++ b/usr.sbin/ndp/ndp_netlink.c @@ -341,7 +341,7 @@ print_entries_nl(uint32_t ifindex, struct sockaddr_in6 *addr, bool cflag) if (!opts.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"); }