summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2009-06-22 16:55:14 +0000
committerjsing <jsing@openbsd.org>2009-06-22 16:55:14 +0000
commit0ba1e6e32b9877d73fe92e7eca1916a727d0106b (patch)
tree8ca296f9e5b096e89fee5c8bdea26b1885660b8a /sys
parentTidy up promiscuous mode and multicast handling; tested by Simon Kuhnle (diff)
downloadwireguard-openbsd-0ba1e6e32b9877d73fe92e7eca1916a727d0106b.tar.xz
wireguard-openbsd-0ba1e6e32b9877d73fe92e7eca1916a727d0106b.zip
Always drop ICMPv6 in IPv4 datagrams, not only when compiled with INET6.
Suggested by Max Laier. ok henning@
Diffstat (limited to 'sys')
-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);