From 860e2a29371228cd10b0ea6c3827d38ae39b8d69 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 12 Aug 2024 09:11:24 +0200 Subject: [PATCH] Revert "pf: some ICMP types that also have icmp_id, pointed out by markus@" This reverts commit f924c2e1ff6df5fe8dbafd8ee5eccf5229b25749. --- 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 9bf594551fd..4591ba89097 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -1791,21 +1791,21 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, *icmp_dir = PF_IN; case ICMP_TSTAMPREPLY: *icmptype = ICMP_TSTAMP; - *icmpid = pd->hdr.icmp.icmp_id; + *icmpid = 0; /* Time is not a secret. */ break; case ICMP_IREQ: *icmp_dir = PF_IN; case ICMP_IREQREPLY: *icmptype = ICMP_IREQ; - *icmpid = pd->hdr.icmp.icmp_id; + *icmpid = 0; /* Nothing sane to match on! */ break; case ICMP_MASKREQ: *icmp_dir = PF_IN; case ICMP_MASKREPLY: *icmptype = ICMP_MASKREQ; - *icmpid = pd->hdr.icmp.icmp_id; + *icmpid = 0; /* Nothing sane to match on! */ break; case ICMP_IPV6_WHEREAREYOU: