From nobody Mon Mar 28 09:16:00 2022 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 094271A40F4D; Mon, 28 Mar 2022 09:16:01 +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 4KRn9r6NPHz4sR3; Mon, 28 Mar 2022 09:16:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648458960; 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=Q6kv7/eBIB5oZGvaLl+U32Rdt+A5n7OZn9zYUgazgbc=; b=O4Go9ssa3YHZ3/cZQxa1cTpVcBuKGf/zwUnHKhQzc5u74tmkwVx70foZtAl66LL5kox4eO LBul2Wm1VvFce44o9yc4/XWIPLPDMninDjl/FUE9VcvSdzZgXp5YuZ3nBqESk52Zu5y5DZ La7U8Vhfn9LBBevdbq3FQZSCRTKhIipn2KvTyYFykxyChKW32E1QvqVdXNGGThfZypCWum IczAMtkjE4L+BjTsEmC9GanE7wqIoZ86zp0x7jia4BlNiz02ILpOvSvxe5xU43ZZrrtiYJ G7GL6TR0jgT/2LFvxDCsnfsiieScQFjSqsHiRzbXe0qpFkWbDBpk1jNd0UNIDA== 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 B77BB27017; Mon, 28 Mar 2022 09:16:00 +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 22S9G0KP087663; Mon, 28 Mar 2022 09:16:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22S9G0I9087662; Mon, 28 Mar 2022 09:16:00 GMT (envelope-from git) Date: Mon, 28 Mar 2022 09:16:00 GMT Message-Id: <202203280916.22S9G0I9087662@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: bea3efc01cb7 - stable/13 - netstat: fix nhop prepend printing. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: bea3efc01cb716e8e77d61af085795eb2d0c013c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648458960; 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=Q6kv7/eBIB5oZGvaLl+U32Rdt+A5n7OZn9zYUgazgbc=; b=bgB5IMu1RatTW/f/xNVnIsAAY6OIZNgGivqGDHbPgaLHtLpPlbeXhOgippTcG8ojUjHhqb hMA/dxk7NKgVCF6BhlOynZgft4+cdI1yntL3et+1NPAKA0cWIrszQJvJcZ1snfPJm3Q53j sjY3QOxiNXV1egzFod+AiDEj4Img2k+O2nsy7RNKYl8iwDFQhJ8Y+/gmXS5qW53c72v7rT zIAGDQmrVhojcPIp7esyQJ277oecsePYkHoUp0KOjMG1INThcHR/W8lrIsgGFoCZqsM/Uh HMYGAmG9hMBi7NJ/uUnpZIt5lxNs1sE/zehqI/u0NdpmC03B96gKkNbLaPCKOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648458960; a=rsa-sha256; cv=none; b=so2Gf0XohcVlja44VKGr0s6/JoNGHkmvPdY6g6Y11Gd1m9cnf2KPxtDu9IIHhZhhDCUCGC ukA8e2JS9yx79oFfNkf1ZedHB84h+NVldHuqnPMc4KeTFt/333gRYSbEFygV+jh67y+d7D gC4BAHX3kHADFqztHTgwRoGYS7WiVD+RZbdbARfAVp5fOLo4Wgb3tns+Q0/ktv8iTzRKwy gi/yeCIc8HuOMRyMeYWv9H6rdPMkCl/DR80JGgJECUrKL5OufZ6s6C1f+oimM0i6Tt8vv/ QGypEDcfMVC6Gn4ArePBGOG9oCNJtqWzCIweyht1a68OSCgs5zDHEQJMQg7GLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=bea3efc01cb716e8e77d61af085795eb2d0c013c commit bea3efc01cb716e8e77d61af085795eb2d0c013c Author: Alexander V. Chernikov AuthorDate: 2021-12-26 15:02:06 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-03-28 08:47:23 +0000 netstat: fix nhop prepend printing. If present, print nexthop L2 prepend data in hex. MFC after: 1 week (cherry picked from commit 731bfa9f180388e4081b64afb94c357643600238) --- usr.bin/netstat/nhops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.bin/netstat/nhops.c b/usr.bin/netstat/nhops.c index 51bed6e23c0f..8fc8db9e7b85 100644 --- a/usr.bin/netstat/nhops.c +++ b/usr.bin/netstat/nhops.c @@ -312,8 +312,10 @@ print_nhop_entry_sysctl(const char *name, struct rt_msghdr *rtm, struct nhop_ext xo_emit("{t:refcount/%*lu} ", wid_refcnt, nh->nh_refcount); if (Wflag && nh->prepend_len) { - char *prepend_hex = "AABBCCDDEE"; - xo_emit(" {:nhop-prepend/%*s}", wid_prepend, prepend_hex); + int max_bytes = MIN(nh->prepend_len, sizeof(buffer) / 2 - 1); + for (int i = 0; i < max_bytes; i++) + snprintf(&buffer[i * 2], 3, "%02X", nh->nh_prepend[i]); + xo_emit(" {:nhop-prepend/%*s}", wid_prepend, buffer); } xo_emit("\n");