From nobody Wed Jan 14 08:06:18 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 4drdwp45y6z6PLD1 for ; Wed, 14 Jan 2026 08:06:18 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drdwp2gMtz3Khr for ; Wed, 14 Jan 2026 08:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768377978; 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=v5D0BHgoi7KZU+nFUofhDZM5kkbmLOMZ3/pXrTH74Yk=; b=rWYALB1GB4ZTMbW3+3Tmsy7uHKVXmFFFNWcY2ytewnQvSHIge6Jfun0GwUMx+x9iKjIwy2 YrA+g1t9D1Wch/1o5P7dFWEsQ8OlKFUYAMtVc02fmMeIz5bnGJSArYL7I48t+ga39kD1gp tYPRvZhWkBoditw75BAfI2Gh7lMJ63KMj1yvDwt1EM2NroKpS3AU9wQGfE4b2t8S5KZ1ob CmpXB3wSzRY2ChczNXdpwOaAwdBFbn1mWmqV5lRh/pPrvteUh7HE4XokdI/N0mtxIdqCmJ otH3USC+UD7Pl9BMWN/qmapc5ZNyCz/IDK9MHRPdXCufopC3jhWlk1EP1Msltw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768377978; 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=v5D0BHgoi7KZU+nFUofhDZM5kkbmLOMZ3/pXrTH74Yk=; b=wfHhQPE9gjOECCRTEIX/6Y3/khCJw4jQke+YEDY7F/HO7gvgb5sx9/fRtDwJcQkLyYDvMo kPUlM8/ihbxUBLXo0H+Olsi0BFrpnUMEvOXfT1g5enJi/l8UjyFyZQF37EIAtK1wYMv+B1 wNvFS7yDrQcXse5iI+LQJGNhdTZ8UrWSqdPXTR/yNoa+okXhb8S9knm/XqDgGpUdSWRMuC FCzedECUXLsNQKzZwHb4LgYoELLx7Xxg1tsvd8iHgedNvmcsQF0BofZUVPCIJjEOhnuZ+8 6zbJ3vF7552/Mr7AKFLfly8VkOSeE8p25AmLVRhe7griLXXeFwk4+CgHSZEKRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768377978; a=rsa-sha256; cv=none; b=I/0l02xU7G+PSmMYaVQMaSMcHXyUQ92Qc5ect2l1eO7eVYTtLuHnMiKYNyNE49+9NHOAbe 0fDDHqobavlp9O+TksNzQu7TZxP77w1N4dKhpFfkI/u1rLVASn1lYYsAyKk7Cv23mST2MQ Ci/GIdE4tU20JZ5gmU/YK3eP7R1TKYOowDrNP0GvZ5sWX7VJ3NVJ/K48icoqxRcIWX6wuY JIeIvRg7acqiGQmiUH4Tme+HEXHaDF5l7O0O/cenjWgqgwCJNwTBkOj9C81R6SrcmF6fVF S4imvYx6xvpEtkALJ428p5gVbXljUIPvS7hP6ttQmuXIb+VCttbHB1+j9exqcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4drdwp1mK4zqYd for ; Wed, 14 Jan 2026 08:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9aee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Jan 2026 08:06:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: e28dfd6b5557 - main - pfctl: make the source limiter output match the input 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e28dfd6b5557a502bad6faecac4b0b8ecfd611cc Auto-Submitted: auto-generated Date: Wed, 14 Jan 2026 08:06:18 +0000 Message-Id: <69674e7a.9aee.2f50381a@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e28dfd6b5557a502bad6faecac4b0b8ecfd611cc commit e28dfd6b5557a502bad6faecac4b0b8ecfd611cc Author: Kristof Provost AuthorDate: 2026-01-12 20:32:13 +0000 Commit: Kristof Provost CommitDate: 2026-01-14 06:44:43 +0000 pfctl: make the source limiter output match the input When printing source limiters use the same keywords as we accept on input, that is use 'entries' for the entries value (not 'limit') and 'limit' for the limit value (and not 'states'). Update the test case to match. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_parser.c | 2 +- sbin/pfctl/tests/files/pf1077.ok | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 78a1034a3b43..c6ad62555b86 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -869,7 +869,7 @@ print_statelim(const struct pfctl_state_lim *ioc) void print_sourcelim(const struct pfctl_source_lim *ioc) { - printf("source limiter %s id %u limit %u states %u", ioc->name, + printf("source limiter %s id %u entries %u limit %u", ioc->name, ioc->id, ioc->entries, ioc->limit); if (ioc->rate.limit != 0) printf(" rate %u/%u", ioc->rate.limit, ioc->rate.seconds); diff --git a/sbin/pfctl/tests/files/pf1077.ok b/sbin/pfctl/tests/files/pf1077.ok index dc8882e1b87b..834399c40d8a 100644 --- a/sbin/pfctl/tests/files/pf1077.ok +++ b/sbin/pfctl/tests/files/pf1077.ok @@ -1,2 +1,2 @@ -source limiter dns-server id 1 limit 2 states 3 rate 4/5 inet mask 16 +source limiter dns-server id 1 entries 2 limit 3 rate 4/5 inet mask 16 pass in proto tcp from any to any port = domain flags S/SA keep state source limiter id 1 (no-match)