From nobody Fri Aug 1 10:12:49 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 4bthbP51Fwz63jZn; Fri, 01 Aug 2025 10:12:49 +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 4bthbP3vg4z46m1; Fri, 01 Aug 2025 10:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754043169; 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=rNfGBY1kNqZBWL8K5UhsFikHImPrw8wg4Nbm8hZyQ4g=; b=LCAhDnMaj337sj23rPT8VLzXSfYRltcG8y1PL3A2vgc7w4+K7VqSIOZPgL8+7l14aUiJ/2 gDiPJ3ZcWYq1WuLawzB0dGVgp4k/3YF0l9z90I/RwmkQU1v/8NG4yS13AzXvT7njeTVidF UZgNM9rTEcXFzWtAjIuC60PjvYQO+VIwnLxQauYMO8yXP/lnCAddoM/ygQ1bFMIBN3u3A4 dFxbo++KoQbJy6aaSmFN4j6gN+L8+4PcQomTXzZ0XKDSc9aZIefqnSsrjSKuDFbUTMILFk XkrUFNpqSJhZIZEsgxWRMXFrWNwnGkKFLVLYcagNAkdNYZe7gc043FBJZhGecg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754043169; 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=rNfGBY1kNqZBWL8K5UhsFikHImPrw8wg4Nbm8hZyQ4g=; b=ad5bsD7ph3s6SPnnOYZH+uTZl4DbhNnGUWuQob2HMjHXYB2mTpfmb/Foskjz52gMHcTmqd JiQFEasfMYjb9svDW1cU0+yk2XbIwzzkkoBw/tNCjn1j90iXfPpMWbSrA3M68pXlhKnXCF edjYwGLCDlW5vFw0ZA6EGtvYdau3FYECGaZpsj+UwasqVqTEAH0daOYxesT5/LivlEZpAZ KVv4sFwza/lrBm89jHvQYQdqlqhqyqPeSUTuzXsD7WG7HYBDUzuSDr+VJCJ5WBtOjFu/5q MOrwit44InZ+NE9CtmZR0vsL2vB+i7WYbzieHlzKds1gOurMJ3Nh72GUM+JVwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754043169; a=rsa-sha256; cv=none; b=qt1HHli5wzDHfSUEKwATm7KYyyyrQEF8oCrgbBjbmzN6Vk5lPxeUXkTNRe7n0BLLm8gwLc qn2jS6uTJgSsRa6R3xdMSxvvfruz6hUl/d+lToY80UmDfl6zOUh+mV/vYtCf7KP+RCdbp2 CE4WQvz8hMjg3fp78V1TNHczxW9TuoBUzC8GUoOIRyXMXpYti4OHVQyXzwvzUJV/R+3vAO coWEA7KAFWCHFZG/dgyJgnZRLxD+0XNwQzLtZY2PydRAO72Q8QDBmzN471Zd6SW9dozZXk pXf1V3oKOsG4EgJd2o81AxJooPGl944Rfxpop7O6z6SjQqH7lE7O+k5wq3bVMQ== 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 4bthbP3G26zkHr; Fri, 01 Aug 2025 10:12:49 +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 571ACnWt090200; Fri, 1 Aug 2025 10:12:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 571ACnqN090197; Fri, 1 Aug 2025 10:12:49 GMT (envelope-from git) Date: Fri, 1 Aug 2025 10:12:49 GMT Message-Id: <202508011012.571ACnqN090197@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: 539da08f5567 - main - pfctl: Use sa_family_t for af instead of int 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: 539da08f55670aaeec69c286db2dd0849c139b90 Auto-Submitted: auto-generated The branch main has been updated by ks: URL: https://cgit.FreeBSD.org/src/commit/?id=539da08f55670aaeec69c286db2dd0849c139b90 commit 539da08f55670aaeec69c286db2dd0849c139b90 Author: Kajetan Staszkiewicz AuthorDate: 2025-07-31 14:06:49 +0000 Commit: Kajetan Staszkiewicz CommitDate: 2025-08-01 10:11:25 +0000 pfctl: Use sa_family_t for af instead of int Reviewed by: kp Approved by: kp Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D51658 --- sbin/pfctl/parse.y | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 358fa909fc50..ddb0f5dc6565 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -249,7 +249,7 @@ struct redirspec { struct node_host *host; struct range rport; struct pool_opts pool_opts; - int af; + sa_family_t af; bool binat; }; @@ -393,7 +393,7 @@ void expand_eth_rule(struct pfctl_eth_rule *, int apply_rdr_ports(struct pfctl_rule *r, struct pfctl_pool *, struct redirspec *); int apply_nat_ports(struct pfctl_pool *, struct redirspec *); int apply_redirspec(struct pfctl_pool *, struct redirspec *); -int check_binat_redirspec(struct node_host *, struct pfctl_rule *, int); +int check_binat_redirspec(struct node_host *, struct pfctl_rule *, sa_family_t); void add_binat_rdr_rule(struct pfctl_rule *, struct redirspec *, struct node_host *, struct pfctl_rule *, struct redirspec **, struct node_host **); @@ -6172,7 +6172,8 @@ apply_redirspec(struct pfctl_pool *rpool, struct redirspec *rs) } int -check_binat_redirspec(struct node_host *src_host, struct pfctl_rule *r, int af) +check_binat_redirspec(struct node_host *src_host, struct pfctl_rule *r, + sa_family_t af) { struct pf_pooladdr *nat_pool = TAILQ_FIRST(&(r->nat.list)); int error = 0;