From nobody Thu Sep 25 12:41:47 2025 X-Original-To: dev-commits-src-main@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 4cXYHw2lDfz68Sg4; Thu, 25 Sep 2025 12:41: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cXYHv6wH1z42q9; Thu, 25 Sep 2025 12:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758804108; 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=91Zx00m7dj44ugVsGWv/utvdMe6UfF/k84r9P7FI6Z8=; b=hpA42SPSM0X/XUKgjO3HGqafNtXaU0litUQZefe5RqsOLKSf10lir6WCxsBcI5qRpHpOGi FrhW4pWW1besZogXgX3AiWISWbGltMHS3JOTNktbsYXy9bgW2y2L3rFJauuhk082farJRs MgYyIe7CJnWS2ZnqVCiIBaJPLc7pWDxTpXRQZcjcIqHZ0QBxHyawY5JLhaH+08SFfxwb6u W5Nq3Z6FgECkbDL+YQZHMPNo2uFOh9jTdKuR52hkXCQUBBDkKjvntHaKISUlqQunAzzrDB FETkhgRa1N69QiyPtIcg9YZx7zJuSYKvEatdAcWibMUnzO57VadMopvk4JU3jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758804108; 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=91Zx00m7dj44ugVsGWv/utvdMe6UfF/k84r9P7FI6Z8=; b=cXamUlHkaBPY1LH/NsO+IeaHB8CcsQ8zcFoxJTAt16kke+JKiOyq+ap6poThBe1K89X9mH M/sc82sVW/RcEzYJII/Qn4lkS5FUOj5Mqb/Xja+E0QW2Yg2YQVu6S9GBZTeQDcRwzpdtpu 7nVpz3wiFnt0zISSwvdWUMrzWrcYy8TkIPDXS5GPpI80LpAzMY8XiVWZByrqpLVdAvsCBj R535bTaxl031xNsGY5Q0zm1/lIZbupibKfalR/6A4bJ5fSCObgxregX5r8skcZ4nDV8Sib 8P5YSZA88KxsP0EqoISlKpwwCzDb5IGd3Ec6XSHxPPCb9r6mE3o5KIjTe9s5+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758804108; a=rsa-sha256; cv=none; b=jHl8LFY+lj08MMskVOOZfufBlVaACFApS7o1lQt+7blopUt2XqZ2oiQG3r1EVoZrT2M72f ixDUzolPWGaShk8j/lpAsKQU62hBVOUnRUeyjg1Df2COEDvU7TxochyKdhfld1/aLI+8Hp u4JICaFIAeH+c2qcjRdX2BI7zV6MJzNjWJmCijudE5YHtOwR8FrsGP5B0BTihIndeaPUoB vfhN7v9+GoEr5Pj5WPitGfuUbTJiPYKBpBRAMxQXFOMuVuoBDMqt0mbEezyV09/lTzWprk HUGceVpjSADREDMwnkFjRJQz06PiLS/6yROdQKqdEzqbTAjLfeAALj6KaZVvMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cXYHv6BjLz1H9k; Thu, 25 Sep 2025 12:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58PCfl8d004852; Thu, 25 Sep 2025 12:41:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58PCflSw004849; Thu, 25 Sep 2025 12:41:47 GMT (envelope-from git) Date: Thu, 25 Sep 2025 12:41:47 GMT Message-Id: <202509251241.58PCflSw004849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 64bfb82f1741 - main - pfctl: print once shot rule expiration time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64bfb82f17417660f3d1a2d10b381b293b780b21 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=64bfb82f17417660f3d1a2d10b381b293b780b21 commit 64bfb82f17417660f3d1a2d10b381b293b780b21 Author: Kristof Provost AuthorDate: 2025-08-28 15:50:54 +0000 Commit: Kristof Provost CommitDate: 2025-09-25 12:41:11 +0000 pfctl: print once shot rule expiration time We already track this in the kernel and pass it to userspace, we may as well show users. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_parser.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index edbc924341e0..f04bc93436d8 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1292,8 +1292,12 @@ print_rule(struct pfctl_rule *r, const char *anchor_call, int verbose, int numer } } - if (r->rule_flag & PFRULE_EXPIRED) + if (r->rule_flag & PFRULE_EXPIRED) { printf(" # expired"); + + if (r->exptime != 0) + printf(" %s", ctime(&r->exptime)); + } } void