summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2009-06-22 16:55:15 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2009-06-22 16:55:15 +0000
commitdb343283608aca778ba14d3e47cbe9e8721e16ed (patch)
treee67b33245cf4707a1d1d374c542ed0bb07b267a2
parentcee98358ee8f85a35f176e95a2d0f74c85bed205 (diff)
Always drop ICMPv6 in IPv4 datagrams, not only when compiled with INET6.
Suggested by Max Laier. ok henning@
-rw-r--r--sys/net/pf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index b20428aa1d5..2c6618ba7df 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.652 2009/06/22 13:55:39 jsing Exp $ */
+/* $OpenBSD: pf.c,v 1.653 2009/06/22 16:55:14 jsing Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -5562,14 +5562,12 @@ pf_test(int dir, struct ifnet *ifp, struct mbuf **m0,
break;
}
-#ifdef INET6
case IPPROTO_ICMPV6: {
action = PF_DROP;
DPFPRINTF(PF_DEBUG_MISC,
("pf: dropping IPv4 packet with ICMPv6 payload\n"));
goto done;
}
-#endif
default:
action = pf_test_state_other(&s, dir, kif, m, &pd);