Import pf.c 1.638 from OpenBSD

Original log:
Some ICMP types that also have icmp_id, pointed out by markus@

Obtained from:	OpenBSD
This commit is contained in:
bapt 2013-10-27 20:56:23 +00:00
parent 1ff3794c18
commit 64ca26f948

View File

@ -2050,21 +2050,21 @@ pf_icmp_mapping(struct pf_pdesc *pd, uint8_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: