From nobody Mon Jun 30 15:00:53 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 4bW8VY6WBJz60ZQB; Mon, 30 Jun 2025 15:00:53 +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 4bW8VY2NLFz3DZc; Mon, 30 Jun 2025 15:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751295653; 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=hvMApV/dyhnPgKvnuB6cFOz270hnJckYbUyuqByQWr0=; b=PKQYYjliTPD6TC8Xa9LZcexop3iAW73Ybf3WVEAFKcb20SzbHJke1niNU4XaMrv2pCCk67 yhArWzkrjaK8+1NCjdXsn8mxXwdBUAbbFi+Sr//wHeR4yL1mnAPgVYkBzJjD4pVNMNFmPq q4udXv5wqxNdIPyyrqy6voC90gbP8DDHXFu5UJ8tun0ZnD9ljiCSPJMhMCXqjwEbfid+vi PtAWYpudflxld6+HS91ZcJ9+yFVVAq2kpI+xM2lhAJz4zblZJN8lKYJR4f0oiGQvgYCOKu jvtKMtzqFL/B004900W2889+PYy8VjOxLyjowa2ACbFqkH+8wh0F1De4NWQXBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751295653; 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=hvMApV/dyhnPgKvnuB6cFOz270hnJckYbUyuqByQWr0=; b=EVcgBgnIUBwZmPlXpdIMucM9V6VEKRohSUfa+xBu5TPs2GMaDAJoQeqFs2ReZpCdhnlhFW FeUKJ0SQC3rorHYGMYT1/Ekzu0+R8kFqkDJRanFoU+GHY1z+dIdKaiiR6EEwK5RyVJjabL WE5kPYDqiocaTczsQanyDkMNO4/EJ7fG2cuT7tSHt6Q5UwrZKIW5Oj0DYgnRHQDsQWIqJ+ skh3Ld0QX53ZHuCWH8yZ785cAkNhvsQGN35g1QgNWwOSkAEUWlyiyDuxZuZ+jPaOtNKx4Y DTO4XcLg2TpsvOo7IcPqXBMSDxQ/0vqr2Nu/ypQIwKLZs/EoIFz7wKvoYWkbcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751295653; a=rsa-sha256; cv=none; b=BUZSoWtwjqs5suB7tjIZIwW0/9lE+Db0Ppsss3mpfKePw0c3R/tdYCqULAXGkCUC3mRDvk 4ryZeO/522AL5gOMDpDWgwfraxX/Y+W4nlBpdEB+S0Wp89mhEqurIUZ/1TW8ptegF5HiFJ IUX02ns4UauO5AS3ui5kEPuXd/4/+4FA61NqLL9kOS/RFVm+BMLkvpwSqXyIb1ngkkESn9 XU6kYFgM5B37byyoaUDFR2qyayzft+uKRk8jTl6DDb5KeQs63UBbO3TmPPkRkSQ5jcrKKP pRMeKtWR+3MVLnGiz4LchUSsVZq+sRb+weB2g+J9kqJZ94Gs/8YF2a2//+egpg== 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 4bW8VY1z2Bz17cX; Mon, 30 Jun 2025 15:00:53 +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 55UF0r5t047585; Mon, 30 Jun 2025 15:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55UF0rBI047582; Mon, 30 Jun 2025 15:00:53 GMT (envelope-from git) Date: Mon, 30 Jun 2025 15:00:53 GMT Message-Id: <202506301500.55UF0rBI047582@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: a59e7964d58a - main - pfctl: Zap v4mask and v6mask in host() 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: a59e7964d58a07bfb570c540a72bf805678034fe Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a59e7964d58a07bfb570c540a72bf805678034fe commit a59e7964d58a07bfb570c540a72bf805678034fe Author: Kristof Provost AuthorDate: 2025-06-27 12:15:18 +0000 Commit: Kristof Provost CommitDate: 2025-06-30 15:00:28 +0000 pfctl: Zap v4mask and v6mask in host() Simply defer checks whether a mask has been specified to where it's set in host_*(); this is to reduce address family specific code. OK sashan Obtained from: OpenBSD, kn , 17e25e9423 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_parser.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 67b63ebf8229..d3017bbd2568 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -77,7 +77,7 @@ int ifa_skip_if(const char *filter, struct node_host *p); struct node_host *host_if(const char *, int); struct node_host *host_v4(const char *, int); struct node_host *host_v6(const char *, int); -struct node_host *host_dns(const char *, int, int, int); +struct node_host *host_dns(const char *, int, int); const char * const tcpflags = "FSRPAUEWe"; @@ -1803,12 +1803,12 @@ struct node_host * host(const char *s, int opts) { struct node_host *h = NULL; - int mask, v4mask, v6mask = 128; + int mask = -1; char *p, *ps; const char *errstr; if ((p = strrchr(s, '/')) != NULL) { - mask = strtonum(p+1, 0, v6mask, &errstr); + mask = strtonum(p+1, 0, 128, &errstr); if (errstr) { fprintf(stderr, "netmask is %s: %s\n", errstr, p); goto error; @@ -1816,19 +1816,15 @@ host(const char *s, int opts) if ((ps = malloc(strlen(s) - strlen(p) + 1)) == NULL) err(1, "host: malloc"); strlcpy(ps, s, strlen(s) - strlen(p) + 1); - v4mask = v6mask = mask; } else { if ((ps = strdup(s)) == NULL) err(1, "host: strdup"); - v4mask = 32; - v6mask = 128; - mask = -1; } if ((h = host_v4(s, mask)) == NULL && - (h = host_v6(ps, v6mask)) == NULL && + (h = host_v6(ps, mask)) == NULL && (h = host_if(ps, mask)) == NULL && - (h = host_dns(ps, v4mask, v6mask, (opts & PF_OPT_NODNS))) == NULL) { + (h = host_dns(ps, mask, (opts & PF_OPT_NODNS))) == NULL) { fprintf(stderr, "no IP address found for %s\n", s); goto error; } @@ -1877,7 +1873,7 @@ host_if(const char *s, int mask) /* interface with this name exists */ h = ifa_lookup(ps, flags); for (n = h; n != NULL && mask > -1; n = n->next) - set_ipmask(n, mask); + set_ipmask(n, mask > -1 ? mask : 128); } free(ps); @@ -1944,7 +1940,7 @@ host_v6(const char *s, int mask) } struct node_host * -host_dns(const char *s, int v4mask, int v6mask, int numeric) +host_dns(const char *s, int mask, int numeric) { struct addrinfo hints, *res0, *res; struct node_host *n, *h = NULL; @@ -1990,7 +1986,7 @@ host_dns(const char *s, int v4mask, int v6mask, int numeric) &((struct sockaddr_in *) res->ai_addr)->sin_addr.s_addr, sizeof(struct in_addr)); - set_ipmask(n, v4mask); + set_ipmask(n, mask > -1 ? mask : 32); } else { memcpy(&n->addr.v.a.addr, &((struct sockaddr_in6 *) @@ -1999,7 +1995,7 @@ host_dns(const char *s, int v4mask, int v6mask, int numeric) n->ifindex = ((struct sockaddr_in6 *) res->ai_addr)->sin6_scope_id; - set_ipmask(n, v6mask); + set_ipmask(n, mask > -1 ? mask : 128); } n->next = NULL; n->tail = n;