From nobody Thu Mar 26 11:20:47 2026 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 4fhLtR3qn2z6WnTv for ; Thu, 26 Mar 2026 11:20:47 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhLtR12zBz3F3j for ; Thu, 26 Mar 2026 11:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774524047; 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=kuzgJBoH35EoDvlpUfplrKaWIL2xtzrfNWj79zDPcro=; b=YiqeJApqFcdR4R67rQv8Q0q9twFmD918uSPjuqbv6wHd1CNtGV6HNH/ChDmPauFZLvQW3s O1GCRz7RPkI00Odj6WW30LfhjU+8N5gYm3LEZLt09SaOV0JO6UTDWtD+4j5cb+K8w18oDk 6DRgGg+256Tkf7Zi9OXdBRFQYQKygCZKIoJhch0YQ++UbXo+Ik+RwAxa79u6l3JgR/Wuij 6NnMirpC2r9GDoCAlTa7feW/Ea/CV9XbGgqoyK3OIo8tPd5v3yfYyT2F/Bh3Xxs7sQ+/qi O6bQPadES99Y7UuZV+Ryov+XZj5IQGr+tkqMYx31AWI5xJwQEsRkflEcZdcpxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774524047; a=rsa-sha256; cv=none; b=p1DvFnbiSMaoX2RwiZf5tsJCDAhiiOC97XKij3sIYHFiDVQU8Gz5W6yj/HeVivacevY/zY c/QOnsKCOlA817zJiu828y1APj1G24kteVvJUtETTRpQllfAAUoHivTGimhdejWggm0Mw7 2FG/02fudM4TBt/kwxfyKd2OZSPTlfu0plA+SBus2QcsceTHS3S+qjy+gKbDoJKvjKq4fr pVbyrWJGcoXf3sTC5Q+oos0KYfKnInClPwSssjDptaJxgVPfw0dj7W57tPLRLPZL8j2qpw e8XhAxtJRfQOsKVCmamiGpi+9/xRcDfp24G6liijw0bRnosAOb6HO4FYWz4EKg== 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=1774524047; 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=kuzgJBoH35EoDvlpUfplrKaWIL2xtzrfNWj79zDPcro=; b=q9vDwEliOCv4z7Z3wl9MlKX0ntN2upEMGWgTZGGIs4ZAiwcJ31f7bqMhekDgyER8Owo+3A A0GtU2qIRiCoN4hYJ8Txs3tBZUky8d4exkI2w0vJt0OjtmZyhq1uEvHIpAlLSY9q2UE5+J mDuoUJnMYAQnNawr3ZrN7TjFRKVpfTjYpXuFOpNNOs+SsuVvx6qGm288hBrmPrGUn/JRpT 7zeDS/UFxecDITbFM9FbO3OR1l2gqrijdkf0U2QpHnbUA1vebhR0noG/msP1PzWbPdgnHm JC6CPmAFLsiLT40cnOEyNKPHUF0skrwF2xjKQqV1Da1SaKzFKVTbYJxZVGcVsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhLtR0K5qzqSk for ; Thu, 26 Mar 2026 11:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ae5d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 11:20:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 824f5e72176d - stable/15 - netstat(1): Fix expire column in -r flag using netlink 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 824f5e72176d17fdfc14be0f2c6f752d7972471c Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 11:20:47 +0000 Message-Id: <69c5168f.3ae5d.12b4180c@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=824f5e72176d17fdfc14be0f2c6f752d7972471c commit 824f5e72176d17fdfc14be0f2c6f752d7972471c Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-22 16:35:23 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-26 09:12:13 +0000 netstat(1): Fix expire column in -r flag using netlink Reviewed by: glebius MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D55440 (cherry picked from commit 2f7cfeebcc4356d3bb85e953900ba5d3f75831ff) --- usr.bin/netstat/route_netlink.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/netstat/route_netlink.c b/usr.bin/netstat/route_netlink.c index e7b2a1964602..2c4b7a5c6b00 100644 --- a/usr.bin/netstat/route_netlink.c +++ b/usr.bin/netstat/route_netlink.c @@ -218,8 +218,8 @@ p_path(struct snl_parsed_route *rt, bool is_mpath) else xo_emit("{t:interface-name/%*.*s}", wid.iface, wid.iface, prettyname); - if (rt->rta_expires > 0) { - xo_emit(" {:expire-time/%*u}", wid.expire, rt->rta_expires); + if (rt->rta_expire > 0) { + xo_emit(" {:expire-time/%*u}", wid.expire, rt->rta_expire); } } @@ -244,6 +244,7 @@ p_rtentry_netlink(struct snl_state *ss, const char *name, struct nlmsghdr *hdr) rt.rtax_weight = nhop->rtnh_weight; rt.rta_rtflags = nhop->rta_rtflags ? nhop->rta_rtflags : orig_rtflags; rt.rtax_mtu = nhop->rtax_mtu ? nhop->rtax_mtu : orig_mtu; + rt.rta_expire = nhop->rta_expire; xo_open_instance(name); p_path(&rt, true);