From nobody Fri Feb 21 12:43:22 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 4YzqYQ4Qs9z5pljR; Fri, 21 Feb 2025 12:43:22 +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 4YzqYQ3Lftz3wYN; Fri, 21 Feb 2025 12:43:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740141802; 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=Gn37RRL0LyMEUFomcrEg2rvVdvLsNhWW6meK6bBGwFQ=; b=me4h32J83nyz/L4tOAhV5ZyOGhIRIRWoozT7zVwPlVmG+y0EYlLLllYU3o3B2+8Jq2QIC9 gSbfj3Mfn2S5AhC5vvoDd8tGNzKF3FlWjMhVDHa5vce6TT3/HWP3SZN0n6+m3bggs07ieW II66e5uzOG0vQ5QzWvU6pEB6bavEjmlDWoQWTco9nC8nKqh/b7TUtnJCErBXRfcw+zE6JS lcxK89Y2I8pIaDfcS0ES69ytUf3iuaPCqhrYUG5/RKq0poXt+SVYZd3FUmtqUXA2/Dc89L aoNcyKbMN2rdNGS/NVaLfY9Fm+oMOntDgoezpkOVv8LRNDlkK8VoTk7h6FIKvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740141802; a=rsa-sha256; cv=none; b=wNRxY8E7iddxDMjUpdUzsBP42hKYdBpCY6fmbFpGLFYI3mj7weWr6KYsGt92dgVgi9YRz1 5EDteRJtAAgjoa5BNjanRkORTa+piJmySoP6YSM0C0TW2GSS1wc0D7Q/O9i4R9z8SDQ7PJ LGYdnFz7NWZwooU3PcOjjR0FLbIFNUwQCLB8a/BFqTwImoK6fDTc6jogiyfDHgZZ3GLdLk kA+fBUV8YD0pKx+I704yzszB+r35pxSCQ7XiDHm1Ee7xX3ATkWt4CCuFPX/mCMXn+oSpUr O3tqkxlR8xWGlarOg0odVHDR20Wy8EIshlVhX6nxm0bmENYwr2yMb5KQRZO1tg== 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=1740141802; 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=Gn37RRL0LyMEUFomcrEg2rvVdvLsNhWW6meK6bBGwFQ=; b=yEic9Yd6t0R9kXmCsGvg71nvJzrDguXLlzPO+MGyVhYWYC9Oxx09ehwT4U1AvACv2/NjFQ 36B5tQhDwlrCREcSHEGAqvk2PTNboC5Z0OFr1RrJLryDv+l5JirkokvfgutnoIvGr/Z4B3 o5L9kPD+ZQSFc3E7iF1WguT1IIXRry/5t/VlgtFMTgvOaDS4GYoSQRxP3z0L2h/43qOn9z qD3DhnKPN5WzkFgJYHOFftSlNAxdZZV2vqyBr3G4peApP3lSKlzSvHuVcDstQ9QtuYI12W Fg26Wujg2I+CwQ5XgA13Zl1JHhG/KceXHJWPKdfnumYUpIfDruvANNeQZPROLA== 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 4YzqYQ2Xf0z771; Fri, 21 Feb 2025 12:43:22 +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 51LChMS6083004; Fri, 21 Feb 2025 12:43:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51LChM41083001; Fri, 21 Feb 2025 12:43:22 GMT (envelope-from git) Date: Fri, 21 Feb 2025 12:43:22 GMT Message-Id: <202502211243.51LChM41083001@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: dbbcbaae1d7b - main - pf: Cut down on if statements around pf_icmp_state_lookup 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbbcbaae1d7bb4d05ebadba95cddbde25c0d1f5c Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dbbcbaae1d7bb4d05ebadba95cddbde25c0d1f5c commit dbbcbaae1d7bb4d05ebadba95cddbde25c0d1f5c Author: Kristof Provost AuthorDate: 2025-02-21 10:52:26 +0000 Commit: Kristof Provost CommitDate: 2025-02-21 10:52:26 +0000 pf: Cut down on if statements around pf_icmp_state_lookup Checked with blambert@, OK millert, henning Obtained from: OpenBSD, mikeb , 12e5d1443d Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 610e65026c28..15d9697c0040 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7659,19 +7659,16 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, */ ret = pf_icmp_state_lookup(&key, pd, state, virtual_id, virtual_type, icmp_dir, &iidx, 0, 0); + /* IPv6? try matching a multicast address */ + if (ret == PF_DROP && pd->af == AF_INET6 && icmp_dir == PF_OUT) { + MPASS(*state == NULL); + ret = pf_icmp_state_lookup(&key, pd, state, + virtual_id, virtual_type, + icmp_dir, &iidx, 1, 0); + } if (ret >= 0) { MPASS(*state == NULL); - if (ret == PF_DROP && pd->af == AF_INET6 && - icmp_dir == PF_OUT) { - ret = pf_icmp_state_lookup(&key, pd, state, - virtual_id, virtual_type, - icmp_dir, &iidx, 1, 0); - if (ret >= 0) { - MPASS(*state == NULL); - return (ret); - } - } else - return (ret); + return (ret); } (*state)->expire = pf_get_uptime(); @@ -8422,19 +8419,17 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, ret = pf_icmp_state_lookup(&key, &pd2, state, virtual_id, virtual_type, icmp_dir, &iidx, 0, 1); + /* IPv6? try matching a multicast address */ + if (ret == PF_DROP && pd2.af == AF_INET6 && + icmp_dir == PF_OUT) { + MPASS(*state == NULL); + ret = pf_icmp_state_lookup(&key, &pd2, + state, virtual_id, virtual_type, + icmp_dir, &iidx, 1, 1); + } if (ret >= 0) { MPASS(*state == NULL); - if (ret == PF_DROP && pd2.af == AF_INET6 && - icmp_dir == PF_OUT) { - ret = pf_icmp_state_lookup(&key, &pd2, - state, virtual_id, virtual_type, - icmp_dir, &iidx, 1, 1); - if (ret >= 0) { - MPASS(*state == NULL); - return (ret); - } - } else - return (ret); + return (ret); } /* translate source/destination address, if necessary */