From nobody Mon Jun 30 15:00:54 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 4bW8Vb0Dcnz60ZVZ; Mon, 30 Jun 2025 15:00:54 +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 4bW8VZ3XK4z3DX5; Mon, 30 Jun 2025 15:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751295654; 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=B9Q5smaq57EGjOEpqtlAiCTb4mAq1SxJthLl3FqBVfE=; b=jOOlnV0feO4dRPnNryztxKu1uEWdlaj7D2lT/DypWY0vF24XG/abNGtmYDwKdyKoeJ/i3y i0vufo/7k7/CifJdfoLe2B1SWJ8cKbING+eWZQSjDQ0a5CHu03Ua8A8GA4AtH1IVd35Gcx eTF3Csl7606lR13Y/CPgfku/Svvk4L7NQZpD53c446viWV6fQA/qyQ/cZX/YSPXSjoQAyn IekJ34l6qcFTzzL/UBDa/V4oHiewRymKykCETVDzM9Eitu9Rl7x+ZIV7NmVKrQ0EIgj1N7 c0KtYsPTY8emsxZFggmFZG8dtUAswickesY92BVYd2U/V8LVb5ch6++18c36Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751295654; 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=B9Q5smaq57EGjOEpqtlAiCTb4mAq1SxJthLl3FqBVfE=; b=VTCD/Nx31TjoMEIjV1+XgtaDLD5UTzSaUdr39fOXO8VLke+CgCMGZT3hAoLHC1wUzjsPhS xvxaZJKylKOUhGYQLGutBdZuvSzT1HCVnNHfzzdzzrZHe+t8f4MJjOzAihZR1njVH4nrl+ sIpZovi4QSp+2IxbAn2faPazloEni1xAhCJo82MzMJdQnmOmYWtWfRG83ZtJWDx4oZjxtP Ph0et0/RrMnDqjBAsUn6CsUuQTrPOU1lsJBQ+27MuTCYqyvUp47H6BzWLWtuXCljPqJvPA mJr7gGaL5fWGrRo67o1rR5vRLn7tIBreQtwPasSmKrM9Vm0o4n1bbEPY0Xaxaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751295654; a=rsa-sha256; cv=none; b=GalLJvHnPObQ4nVJf3n98dhHN7qmOeScVH63Y2igXiy4Z4hetwluRZ5noJi77Z4nZAK7MF pbCursz+Z9040H35y80aJ+yh2AB4OJ4kXvaCnuYP/S67Nl99MisP+iV64PolDb0DhYTEws gWnyKeHnmS79uK44K/8pNln34wJ6aihi4V6NEINnN7eer3YKTQBI1pwtoWzGgoqoQ5UZAZ txYOLROx5Kn/RTUw5lXUDIQnu9zDXnupw0vc7tt66ydk+EoB6JlRCQeLk5GTB6dCw1kai+ 9coeGGvBMzLtEPTcaBxKquYgCTmVtDLnDYSUuhM0UZu1+aSu9z8foWC0mNBbYA== 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 4bW8VZ2xyyz17k9; Mon, 30 Jun 2025 15:00:54 +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 55UF0sFm047620; Mon, 30 Jun 2025 15:00:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55UF0scN047617; Mon, 30 Jun 2025 15:00:54 GMT (envelope-from git) Date: Mon, 30 Jun 2025 15:00:54 GMT Message-Id: <202506301500.55UF0scN047617@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: eb6c2218fe64 - main - pfctl: Zap bits in host_v4(), use mask parameter 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: eb6c2218fe64451dff6bedde092b7a04db753a9c Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=eb6c2218fe64451dff6bedde092b7a04db753a9c commit eb6c2218fe64451dff6bedde092b7a04db753a9c Author: Kristof Provost AuthorDate: 2025-06-27 12:17:23 +0000 Commit: Kristof Provost CommitDate: 2025-06-30 15:00:28 +0000 pfctl: Zap bits in host_v4(), use mask parameter This avoids a duplicate strrchr() call and makes the function consistent with host_v6() regarding mask handling. While here, use the destination's size in memcpy instead of hardcoding its type. OK sashan Obtained from: OpenBSD, kn , a7ede25358 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_parser.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index d3017bbd2568..0c5f184106cd 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1885,11 +1885,10 @@ host_v4(const char *s, int mask) { struct node_host *h = NULL; struct in_addr ina; - int bits = 32; - memset(&ina, 0, sizeof(struct in_addr)); - if (strrchr(s, '/') != NULL) { - if ((bits = inet_net_pton(AF_INET, s, &ina, sizeof(ina))) == -1) + memset(&ina, 0, sizeof(ina)); + if (mask > -1) { + if (inet_net_pton(AF_INET, s, &ina, sizeof(ina)) == -1) return (NULL); } else { if (inet_pton(AF_INET, s, &ina) != 1) @@ -1902,7 +1901,7 @@ host_v4(const char *s, int mask) h->ifname = NULL; h->af = AF_INET; h->addr.v.a.addr.addr32[0] = ina.s_addr; - set_ipmask(h, bits); + set_ipmask(h, mask > -1 ? mask : 32); h->next = NULL; h->tail = h;