From nobody Thu Mar 26 11:20:48 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 4fhLtS4GVGz6WnXW for ; Thu, 26 Mar 2026 11:20:48 +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 4fhLtS28lwz3FK9 for ; Thu, 26 Mar 2026 11:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774524048; 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=sZb97VNwBDfXkFqwASM2G6VstbJIC77qacLqA0EaMCU=; b=WylS7GWTSswFankulGs94nsTi6/he6ojHSYU339tBwGTzkGNAiK4mTflkofh7AkH6/58fL 6rcjWu+Lsk2F7JIEUsGgyJlNk8wQrxG5/wO2dPU/jQ/spd4Gjbi/IhIez00MJX5MXO9/Po ukch1T8OrdDkmVGny/vABGtjeJTZyBsU8+5j8l605HWb0x1zrpsQjtCux9HprxWkyGbR5J hGriIRU9GeemcEaKW3G5RxMNrBv2Y61hwGIUeBNlpspuuv0g7mHM0A6ZgLjucqBkc64kX/ GkcTmVcYnGVQ8aijwiv4dlmgYoChSia5KgWgPQwhessBZB4T36Gf8YJfZXcsVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774524048; a=rsa-sha256; cv=none; b=a7pPMKzyo57RIFhb0Nwt6PKH5ds11LOgW1KjLvbhUFeJCwKtZvovfM4KcU9YySZ3Zhfutg c3S/3W+zQ7Tu2EGR9BqrA74TsYeiGLqxVIjzxvYJuBJCl1pdYIOQqJr+l+Zx/k/rxELRcG 9EG9bLhj5oCqoVM1PRnGvGt5m0/cQUQQzCnfqj6fkSnE4arO7i5dy9LqxOg3qfNufep6NU SDzx8e4AO7+hSeNc1jYby1BQitXsCunYnEpJcSpak4aWwLw+PoK6frDnp1/z1UrYHuHGWD wXNkFmWPwLa+xFkk0xTkHzWpwjWOD4PovXT3TCgNj5plGQYS5cOyIXFTZn6v0A== 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=1774524048; 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=sZb97VNwBDfXkFqwASM2G6VstbJIC77qacLqA0EaMCU=; b=YXHkQVzGyQq5B9DGgx+RulJLMwONl+xJOJOP6vKFTHhdWrcqZASutCLz5V+G30I+xTpJ0S w+0bFMtgESmj0fOwtnAAF9Y+Z4c72//fdwXdU9rsLZYAI9ZgLW8n87YxVpWQ4p1BTdmU+6 lxW+AltgwZRlVDf/lZLeL+4t1NpNZ1t2aezwRPu3bwQIO7MgG63BkdbZLECj1aDOE8yasL Hurv3R2lm2nv0hd2yCANctxs7oSBE7PLXiMpCERiL5z6EeyLWhczfFQ91KIpK5y/SyeSKq dncVYUCFFQFg3aBz9sb0lCyP2orZG5WG24wSZOi/OGUI6ly8SeEBOrj/zx6VTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhLtS19MGzq7Q for ; Thu, 26 Mar 2026 11:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a41f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 11:20:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: f088a26db73c - stable/15 - route(8): Fix -expire argument when 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f088a26db73c269e2aa11caed33294ae1ece3814 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 11:20:48 +0000 Message-Id: <69c51690.3a41f.2c7bc549@gitrepo.freebsd.org> The branch stable/15 has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=f088a26db73c269e2aa11caed33294ae1ece3814 commit f088a26db73c269e2aa11caed33294ae1ece3814 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-22 18:41:31 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-03-26 09:12:14 +0000 route(8): Fix -expire argument when using netlink Also fixes nexthop expire value on route get using netlink. Reviewed by: glebius MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D55444 (cherry picked from commit 8230cf1aa18d9215ee17fec743fc7c7c8fa2da13) --- sbin/route/route_netlink.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index ba22a2ec1e22..5dde7501d6b4 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -263,6 +263,9 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, int rtm_addrs snl_end_attr_nested(&nw, off); } + if (rt_metrics->rmx_expire > 0) + snl_add_msg_attr_u32(&nw, NL_RTA_EXPIRES, rt_metrics->rmx_expire); + if (rt_metrics->rmx_weight > 0) snl_add_msg_attr_u32(&nw, NL_RTA_WEIGHT, rt_metrics->rmx_weight); @@ -343,7 +346,6 @@ static void print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, struct sockaddr *dst) { struct snl_state *ss = &h->ss_cmd; - struct timespec ts; struct snl_parsed_route r = { .rtax_weight = RT_DEFAULT_WEIGHT }; if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, &r)) @@ -385,11 +387,7 @@ print_getmsg(struct nl_helper *h, struct nlmsghdr *hdr, struct sockaddr *dst) printf("%8lu ", 0UL); printf("%8lu ", rmx.rmx_mtu); printf("%8lu ", rmx.rmx_weight); - if (rmx.rmx_expire > 0) - clock_gettime(CLOCK_REALTIME_FAST, &ts); - else - ts.tv_sec = 0; - printf("%8ld \n", (long)(rmx.rmx_expire - ts.tv_sec)); + printf("%8ld \n", rmx.rmx_expire); } static void