The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c5081b8d3918564c1aba5a5e3f0a5219568e3435
commit c5081b8d3918564c1aba5a5e3f0a5219568e3435 Author: Kristof Provost <[email protected]> AuthorDate: 2024-07-10 11:32:03 +0000 Commit: Kristof Provost <[email protected]> CommitDate: 2024-07-31 07:39:53 +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 <[email protected]> 8c0632cd274b Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit e296b0de9e467b8c5eb853f6cf4c6ea28d4119a2) --- 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 b3c4d47cabc2..e74a385d0f72 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1777,21 +1777,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:
