From nobody Fri Feb 21 08:11:46 2025 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 4YzjX31fFDz5pMwp; Fri, 21 Feb 2025 08:11:47 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YzjX30nPbz3QNB; Fri, 21 Feb 2025 08:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740125507; 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=FwgV9jkncXsj+swl8BU6GILug71TIWWjJFHRJdDp2mI=; b=JyzOszcUP/aCbMtNRXavJzy/p52+kfPGxAkCVmCG5zfqvGAN+OJdiDfC9/GRfnEYj3cNX/ Qhk1JxWyxcaktMJa6q8k8/9yLhsXjwW/x8yIFu+ZGiZ+U5gWFRsaDXtzKg9IaIj8pE0a1S Yuqlx5Ab+a1qTu5L5AumBF/RBi0cd6Kxg2Qpbqx5h7JmCYxMbO2O57972/JDIxRk9Pbpbd UhAVpjuq72xL4awlDVGUQ1fRxDs+3Ls4WVZbZNUNtnR6+QS6Em5f2zSFQj6I1izrzBvmzY Yl/hJ4BO2mR9iHjcwPrAjD+3MeUzeUowv2nrOnmQwcDxA9cqwxnNrKFgMCHbCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740125507; a=rsa-sha256; cv=none; b=BNsyM/l1kTKtrDC5/wbTIOsgR94tqL01KZxIr37m7KkbAjZG7z1/cghQlGOWCh1x35Nx6e Br8KLzXeAteo1dBDL3Yu4edGkN1QidkGDqoBDiivu1HLwR2nruQw6LkJS7fV8G1I5NB6Mq jtQE6Yff2+YgAFk5Iuj/NZMsujY0PdsY0JbiMtYMgELTDEhdF1E084lo14pHC7ewaNyAak DFPj+/wPfG7KruFr8lNqHeMla2uld4xHJ9dACkFuFs8TJpeVjtPtcAcEQXhDuwTVEgLaOp uKDAdeR+nYvGxorzfEu5tHLB7BBuAZvqQlCT6F6vL/Bof5T1q/rr20Fw+LMgbQ== 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=1740125507; 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=FwgV9jkncXsj+swl8BU6GILug71TIWWjJFHRJdDp2mI=; b=EVGOmPoPSoayp1ZEudxafhwbchlGVT0YnRcAHW68VBQSNd6Z0/hKF5TOZqmR32JFHi1ix0 RIMsYWnkL/+0KpMiFL3CaYUJcDiSlmDiTB7EVXlg1PKIw6OexImFI1PPXv6aECo2hWl0R3 I6vZj56W6LhvsJl/1BZlUTznc+HnLu1sj56MuzuZ1MjvyMifAnmxsLqW8/+ag7zdhlSPK3 0H7fgoUT1vLikEoEcQoAsr6GL1hhtOULxBsib8wJrajEnVilJJLkRkYDvU9EcA+VrAh3OO rDdiZIeOXadurRP/Bqe9LzzKpvmh995pPlOL4PYgsqoyIRqoxUKrbFE2GqkNKg== 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 4YzjX30L4nz1Rvj; Fri, 21 Feb 2025 08:11: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 51L8BkIl075897; Fri, 21 Feb 2025 08:11:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51L8Bkhe075894; Fri, 21 Feb 2025 08:11:46 GMT (envelope-from git) Date: Fri, 21 Feb 2025 08:11:46 GMT Message-Id: <202502210811.51L8Bkhe075894@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: 8754ba5a5f6e - main - pfctl: Rewrite to void using union sockaddr_union 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: 8754ba5a5f6ee681de776601110313b69a779067 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8754ba5a5f6ee681de776601110313b69a779067 commit 8754ba5a5f6ee681de776601110313b69a779067 Author: Kristof Provost AuthorDate: 2025-02-13 17:30:12 +0000 Commit: Kristof Provost CommitDate: 2025-02-21 08:11:02 +0000 pfctl: Rewrite to void using union sockaddr_union ok mikeb Obtained from: OpenBSD, deraadt , 8717211fe3 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_table.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 7137f42b13e8..90e87adadb0f 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -36,9 +36,10 @@ #include #include +#include +#include #include #include -#include #include #include @@ -496,20 +497,24 @@ print_addrx(struct pfr_addr *ad, struct pfr_addr *rad, int dns) printf("\t nomatch"); if (dns && ad->pfra_net == hostnet) { char host[NI_MAXHOST]; - union sockaddr_union sa; + struct sockaddr_storage ss; strlcpy(host, "?", sizeof(host)); - bzero(&sa, sizeof(sa)); - sa.sa.sa_family = ad->pfra_af; - if (sa.sa.sa_family == AF_INET) { - sa.sa.sa_len = sizeof(sa.sin); - sa.sin.sin_addr = ad->pfra_ip4addr; + bzero(&ss, sizeof(ss)); + ss.ss_family = ad->pfra_af; + if (ss.ss_family == AF_INET) { + struct sockaddr_in *sin = (struct sockaddr_in *)&ss; + + sin->sin_len = sizeof(*sin); + sin->sin_addr = ad->pfra_ip4addr; } else { - sa.sa.sa_len = sizeof(sa.sin6); - sa.sin6.sin6_addr = ad->pfra_ip6addr; + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&ss; + + sin6->sin6_len = sizeof(*sin6); + sin6->sin6_addr = ad->pfra_ip6addr; } - if (getnameinfo(&sa.sa, sa.sa.sa_len, host, sizeof(host), - NULL, 0, NI_NAMEREQD) == 0) + if (getnameinfo((struct sockaddr *)&ss, ss.ss_len, host, + sizeof(host), NULL, 0, NI_NAMEREQD) == 0) printf("\t(%s)", host); } printf("\n");