From nobody Tue Mar 04 12:16:07 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 4Z6ZQv5Pw1z5phZD; Tue, 04 Mar 2025 12:16:07 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6ZQv3CMbz3DyL; Tue, 04 Mar 2025 12:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741090567; 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=KeRyk0ovGCdGLKanMiEuRndhimURQVH/3sbXhrl2ixA=; b=lrPLvfk2wkdS/BtWGcWxkqhYUUmpTsCsE0r9Y8nLzqFudnwZwEIXe1YE/32QeMElffC9dI 5+DvpExEaktx1u6uhE6EmweOGL+/mvrKZ1RJnNo+HUWj3CRYxzp7T4pUmLwosIB3+Zp9Sb a7kiH1MPDjLdHrNKJTOBnrIIWMfLZm9QY8HiSTRYa5UZ9gZ1KJMIj6tqGpNci9+Axszdoc C8WgHxYTifbg4/WASCQK0T9KO+QY8PJoS7z9eX4oDc22vNi/7v7OXp3bG0XwRt1p3kQCh2 Vjw2dNeBNXT/80L8q/UxbXVMEmUMKw1TcVqAoQSYYLu0BPL3Np25nAUOJV4HeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741090567; a=rsa-sha256; cv=none; b=vmkf1LBaZgUcm1r8pkjO399cD3gdN8sLwI/+ExFdOs2l0SRSYX7pucXoWL0cwusTsX7Gnd 8LRkOU+ajkj14laqbpKd6mdVI9WUPLg92d/vQz1eYsTpUPTu1039XVA+SGND5xbmGjE8JH EM1vL9veTCTEQg7VXzjQozj/EdZfPUc0QTOEbUeJ+ZjKosbyZzGrxpjcDAgWF4HTpdmcCN 8yoWiMYq0yXjYw+4bJC7v+g7NgBSAEyG7sLNPyK/2ZAnU2nEXHptB83b4Noz+t8Nf7NgRw hr+uP2hLYZtl8OtZg4KT+OtbMrWc5pqtM7OmbDkxN0u84q44Snq4xE6aYwp+4A== 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=1741090567; 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=KeRyk0ovGCdGLKanMiEuRndhimURQVH/3sbXhrl2ixA=; b=Iz/oBYqMWB3zWA8ZzIHFFhBygo8voi7FrI4+fKrnEWVmfuCAYfVXvmihJJ6YQ01RYR77AU 9Ibv6VRL5o2TIBhwFCQFh0IfH3X135fpI1szxD2kKdrODA9jzCKNP3wnQqqmNluLw+x8ux 45WHrrhkH0ltexKTkb/Oq3iGaSzb7IeOMNqLUEpnl8HRs9l6GwWBm8haDrHDon3+HsyH+y AmdcNZWcmdnBwqK1DcTGp0DKZyHajm+tXiPZ8uW7oGazSbIfpE88dw34KZotaJ1JfUMy9C 0asifyie+B9kx4QL5e2nYn2afOX0m0dIS4Km2cNOk+3gNuPaffY9oZyAAAe2Qg== 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 4Z6ZQv2pqnz30w; Tue, 04 Mar 2025 12:16:07 +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 524CG7kA055807; Tue, 4 Mar 2025 12:16:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524CG7pB055804; Tue, 4 Mar 2025 12:16:07 GMT (envelope-from git) Date: Tue, 4 Mar 2025 12:16:07 GMT Message-Id: <202503041216.524CG7pB055804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kajetan Staszkiewicz Subject: git: 2624ba37e633 - main - pfctl: Fix printing af-to "to" pool 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: ks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2624ba37e6336febb40ab6317d8e4ea63b60fa44 Auto-Submitted: auto-generated The branch main has been updated by ks: URL: https://cgit.FreeBSD.org/src/commit/?id=2624ba37e6336febb40ab6317d8e4ea63b60fa44 commit 2624ba37e6336febb40ab6317d8e4ea63b60fa44 Author: Kajetan Staszkiewicz AuthorDate: 2025-03-03 10:43:21 +0000 Commit: Kajetan Staszkiewicz CommitDate: 2025-03-04 12:14:07 +0000 pfctl: Fix printing af-to "to" pool We can't depend on pool->cur, that is used only inside of kernel for iterating over members of the pool, it is not filled in during loading of ruleset. Reviewed by: kp Approved by: kp (mentor) Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D49213 --- sbin/pfctl/pfctl_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index bb458bce24fb..eb3a0826578e 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1245,7 +1245,7 @@ print_rule(struct pfctl_rule *r, const char *anchor_call, int verbose, int numer printf(" af-to %s from ", r->naf == AF_INET ? "inet" : "inet6"); print_pool(&r->nat, r->nat.proxy_port[0], r->nat.proxy_port[1], r->naf ? r->naf : r->af, PF_NAT); - if (r->rdr.cur != NULL && !TAILQ_EMPTY(&r->rdr.list)) { + if (!TAILQ_EMPTY(&r->rdr.list)) { printf(" to "); print_pool(&r->rdr, r->rdr.proxy_port[0], r->rdr.proxy_port[1], r->naf ? r->naf : r->af,