From nobody Thu Feb 26 12:35:25 2026 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 4fM9sT5y23z6TY9y for ; Thu, 26 Feb 2026 12:35:25 +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 4fM9sT5Hd5z4J8p for ; Thu, 26 Feb 2026 12:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772109325; 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=kBoaMqzp81CuGFhbrAr1nXs7UZ69Y8+g4sWPezuBQ5o=; b=gCGkHXutwnFFZy+Ina3PQTN9m0KCe7VCQZkFSVKqfYre3nj2dTNxwj2nq4FmVWIgvxce09 qnqGBVdYjjloulZFyIzutwpmenwN7JSLedy2IiE5aOpKnHH9mIbePa8XXzvo4KNJBa/YIf 6a0FBHs0mlKciqGrZNrQyGBWVqbtqspW/BSoVyMqjMlKW4ktNjPslFeaEyRf42TyDX9YAg ubjR3dFBV0SekwDJGAjl9RMHvk37HZb74YqDp8sbbaECDGCKhyHGbMYc3urwHJ0s+Annc8 tslPwsBtxtrmCur1ph5dAwYBt+GGGWVQmrE4blIUWzIgzu1xhJDm3MERk9W25Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772109325; a=rsa-sha256; cv=none; b=xGizXHstEoeawb5kvfvAMAiuTmWoPbCVOkKp3EMP1qKAS/afhPwfcTbOeXEB2VD8oWPf1g uN/NirQ6yRy0bnD/HQUqT0JiGPHdbscEBfONwUpDvFpAaPe+uKVQ/ri9ckDhu8JP19BndP l5nnqBNy484Lloios7IhkJzd0H3/3SuyM8yrLs3pPCBv5pPmz3djoq2KFcULVSLr4O7390 PHpJ8Gl5ItdfZw26dqS1GWRYtldWv1DEVpq1FS8VsXPL1+PM3fSiT0uIHbnR4GSDsSBHsU tCEqrRzL6aK8SidWyk3d3iyMZZIKVCKameapFcNZ7aXOdiisVReeFVr9U9SCPQ== 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=1772109325; 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=kBoaMqzp81CuGFhbrAr1nXs7UZ69Y8+g4sWPezuBQ5o=; b=W8fvS0EN5Olu8gLg/iVnK7hLLoyAIoKC9D7O0O+sm5uGXLuzUyk01eCN1gSyVbQNLgsArL CHdlYT7wvvKedTsbr3Wq/wDthzMy8Khw5X4oTzgDrVOkwYbrYEdGNib9gbbM5wA9MmEXvT x8wFzbZpL1pZMseU6xDgetMqcmrWSC15DS5hRYFqes3rtfFxQPOQWPUidSomvBmQobKxj8 tqIkopy2BgBf3lYTovDCwG4euio6jR0Woyxho1lVnAAiID0BpgxDZXfcJdnQlhJsmTj2Py YSY7FMCnljxQfa0Fnwg7ASFHXtsCVQSN4l7tyOSKcyszDqBQegEcNkOiWIsPUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM9sT4Z49zYPB for ; Thu, 26 Feb 2026 12:35:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19718 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 12:35:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 2f7cfeebcc43 - main - netstat(1): Fix expire column in -r flag using netlink 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: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f7cfeebcc4356d3bb85e953900ba5d3f75831ff Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 12:35:25 +0000 Message-Id: <69a03e0d.19718.7418763e@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=2f7cfeebcc4356d3bb85e953900ba5d3f75831ff commit 2f7cfeebcc4356d3bb85e953900ba5d3f75831ff Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-22 16:35:23 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-26 09:48:09 +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 --- 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);