From nobody Thu Feb 26 12:35:26 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 4fM9sW1JBSz6TYLy for ; Thu, 26 Feb 2026 12:35:27 +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 4fM9sV67XYz4Hp3 for ; Thu, 26 Feb 2026 12:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772109326; 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=XoimmNYlzNV/o0kUX/vqzdLWAdxqpsX1WZV4I9hTLGg=; b=J5NC3y7CFEd/y5BlqhFfVfJ4lRWwxztMSR9oGIo4I+TeLgupTXjZuEiMK5LMvkw5Z5ZXE4 g9G9zB8Ob8yI8kmUYyccyUALfv1DnzR9963vy1xEXjJYUldyQ709ufd9BajCp5nTrZTCJx BeIGEweq8avegqu0CCp/Z8hGRB6oqhPTwmzeQWgjcvffdwyJ6SJCChgoTnnxGn29c6/rLw 6mXgMvl6joXy0pGVNgwewwl3AKK/ogWj1hZkvGsuW4agWJzF08K5zP3fKCdo108qQeYNwb pdi4emaVLkE3OJbItmi/Pi/hAd8PYo3F1C8riRvVfLWME2BIoqmqxB3ocKlOMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772109326; a=rsa-sha256; cv=none; b=KQPfOYENcx9THas17ejyznAkSCYbcvcGiGs1epNV7qpi37b+C4G4eG/snr2a841+GVwbZ5 3m/wq+0gXZQV2Fe0FC1MN9HsiWhVJsRtDQZ3ZqP6EOjNCyH7IvVNU7hZAhTA+cqVSC3+3s fcup75VQK/dlJUPjuHLdZ/6lsQY4DrLzTE5z6l8oYHinIIyyZ7+lcltLrhcuRKIYjDFfgJ 76dgXbnxmLYCDjmwN1kQuwquG7uRKOY0zKlrHb+AX1KKOLcn3KusBFTxHlzfmV1cVLyd+M YzRoytbo5lj9VxhK0Bk78/cPhpoV4j/vlNKAw1PaU4hNBgSiDcRZ4ugDED67jA== 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=1772109326; 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=XoimmNYlzNV/o0kUX/vqzdLWAdxqpsX1WZV4I9hTLGg=; b=cZJmY34rwbKAvmHLezxnIiXbozYdThGb3z2eOkaczSaYHzSzGE1upGUkiKvWuoZaxN02z9 5L0+4rQjkns8B+jlcqB8V29XlLO7JzbfFmf/gDGDvEDC/PtvHP6OyVmZF4wyZy9tQlthld a9q4BvKu1p3CzKkfnmTKnLVlC35IRjBoqPWogZqsMH/rmqKbLqCdIvPJQ64Sg2r1vvpiAG BVAS9ALVHMgww/EQ1nxdg4llbCCRTAGv9hZaL48LR22VmScc8Dqa1AKcNW87aFOpffZLHY X6CadDhL0v+KHXscusi7SAc+Hg2GTwRqU5pPypIpowDOTxwGzdLmSQx/OEHrNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fM9sV5S4czYP6 for ; Thu, 26 Feb 2026 12:35:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eed8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 12:35:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: 8230cf1aa18d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8230cf1aa18d9215ee17fec743fc7c7c8fa2da13 Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 12:35:26 +0000 Message-Id: <69a03e0e.3eed8.1a2b1f6d@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=8230cf1aa18d9215ee17fec743fc7c7c8fa2da13 commit 8230cf1aa18d9215ee17fec743fc7c7c8fa2da13 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-22 18:41:31 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-26 09:49:01 +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 --- 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