summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2009-03-14 23:44:10 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2009-03-14 23:44:10 +0000
commitb8b9906f29b5dab596f52fb25d82a32ea7de179f (patch)
tree75a76e50d94d841a25add9291a8e6f3e171ae38e
parent7536b869daa5c62932e85340117ff745123764ff (diff)
Some ICMP types that also have icmp_id, pointed out by markus@
ok henning markus
-rw-r--r--sys/net/pf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 0ec86a23189..7e79567ceec 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.637 2009/03/09 13:53:09 mcbride Exp $ */
+/* $OpenBSD: pf.c,v 1.638 2009/03/14 23:44:09 mcbride Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -1581,21 +1581,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: