From nobody Mon Jul 29 17:42:53 2024 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 4WXm0Z0TZ4z5Rff5; Mon, 29 Jul 2024 17:42: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WXm0Y63zqz4MZG; Mon, 29 Jul 2024 17:42:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722274973; 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=tWUU8uFm6ZGCdWnzX9Lymi2GCKYUp3v/FNV/C2GN4TM=; b=aYB+cDWNS3qLCj2oIFe0+G8LDSQtFfCXitK87FcbAvT75A8UMdciWAg1p/dym246XwEFbs m8tMZvqm8WtxEDzfxd3M35TnAqBBY+RAzYV2QIZSxjExtfVIcmb/j3Upg8kI1dZsgEWH+h vDf/iqSV4o8ggUEoZqL5zh5UFGcfdP+TVdy/SuVKWIejcgyvaMfo36To+NC4oUzSWPlpuu rrc5nk3czS25Ie3FuEHNnPfP557qYQXvtIAlZeDcK1U7KNq4ojpYhfsu5rzzvlUBFTaryH 9k781ZdUQvfek9LNQ/FoWTHX5kPGV+LNcKNAksb/wm0bxxkHR0jY/VEmk18Uzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722274973; a=rsa-sha256; cv=none; b=NfvgdLwZDTWBxLFs2Xs9nUVD+NwW8wZGyd4Je5Ru4LwbR1PRIADAWbP0RBBNmChhVlweeG k3e9jdvr8/8BH4qG9apMFPTIIsBnesZgxHnog52P5jAXg7+fYMJcA1gZ8/DOfjTyrnpyOz xbLrBQCTQDhGBH0ej+TnEHXizgIfRy0M2+muClDsEJ9juTnZGYQE+f6p1MSV0pKzPlEVYt nt6IotvE8ur49TEFFeLP/dFTwfVhtSLl4DtiMlkvxa6izphiveojjtj1+U2WD6w3mDxFhM t64fYzOKj63lVL1Q539X/6QAiPv9Pv6Zm4N7T4kBY/OKQKJyMSR7N9Cxe6Ewpw== 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=1722274973; 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=tWUU8uFm6ZGCdWnzX9Lymi2GCKYUp3v/FNV/C2GN4TM=; b=l7eCd4PQ/3u5+Z+2SkxVbkXatqIZdfzFBxrgxxb/+eq79joXLwLaHL0OeP1q0maaWwmaLz /BJqhosbRZi4qHulLFbjkadkNPklEZed2f9oKYgSyw3RNSWfqS1jVRqKPKleiK2x4n5s3c 8KuZuhcJJkP3LaP43sq+NqRnaYgLLCHDhmMa+3j4GQvQ+w/v/l/sEh6grjyVi66v6+vJw+ 8718HdJmcRUh2tNCUoJMr4eNB5Pb7EU218Zhsuiq3Zt3js+ejBacIk5isR4oMO+dAp7jen MpKiJLFSWPOz09pfiP+7Gw96kFJEoa2vxOo8A8iiG34vRQcKH5XyPKhQukF6Qg== 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 4WXm0Y5h4BzjyT; Mon, 29 Jul 2024 17:42: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 46THgrjB023175; Mon, 29 Jul 2024 17:42:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46THgrm7023172; Mon, 29 Jul 2024 17:42:53 GMT (envelope-from git) Date: Mon, 29 Jul 2024 17:42:53 GMT Message-Id: <202407291742.46THgrm7023172@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: e296b0de9e46 - main - pf: some ICMP types that also have icmp_id, pointed out by markus@ 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: e296b0de9e467b8c5eb853f6cf4c6ea28d4119a2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e296b0de9e467b8c5eb853f6cf4c6ea28d4119a2 commit e296b0de9e467b8c5eb853f6cf4c6ea28d4119a2 Author: Kristof Provost AuthorDate: 2024-07-10 11:32:03 +0000 Commit: Kristof Provost CommitDate: 2024-07-29 17:42:26 +0000 pf: some ICMP types that also have icmp_id, pointed out by markus@ ok henning markus MFC after: 1 day Obtained From: OpenBSD, mcbride 8c0632cd274b Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 0ea68834ac63..f4832e2b5481 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1808,21 +1808,21 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, *icmp_dir = PF_IN; case ICMP_TSTAMPREPLY: *icmptype = ICMP_TSTAMP; - *icmpid = 0; /* Time is not a secret. */ + *icmpid = pd->hdr.icmp.icmp_id; break; case ICMP_IREQ: *icmp_dir = PF_IN; case ICMP_IREQREPLY: *icmptype = ICMP_IREQ; - *icmpid = 0; /* Nothing sane to match on! */ + *icmpid = pd->hdr.icmp.icmp_id; break; case ICMP_MASKREQ: *icmp_dir = PF_IN; case ICMP_MASKREPLY: *icmptype = ICMP_MASKREQ; - *icmpid = 0; /* Nothing sane to match on! */ + *icmpid = pd->hdr.icmp.icmp_id; break; case ICMP_IPV6_WHEREAREYOU: