summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2017-05-30 08:58:35 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2017-05-30 08:58:35 +0000
commitc7e4154a5ba9eabe65acaf578821eb1ade710308 (patch)
tree1d219d6a7b86b944bbed54eb54428944ec9ceb7a /sys
parentcc2efdc778a9071f7f5b35d3fa3c9a26d6525008 (diff)
Enable slaacd(8) by default and disable router solicitation and
advertisement processing in the kernel. Go for it!!! deraadt@ additional encouragement to push forward from at least mpi and henning special thanks to naddy for being an early adopter and finding bugs.
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet6/nd6_rtr.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 7fc1e36e0ec..099a9e21904 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6_rtr.c,v 1.158 2017/05/16 12:24:04 mpi Exp $ */
+/* $OpenBSD: nd6_rtr.c,v 1.159 2017/05/30 08:58:34 florian Exp $ */
/* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */
/*
@@ -282,6 +282,9 @@ nd6_rs_output(struct ifnet* ifp, struct in6_ifaddr *ia6)
void
nd6_rs_output_set_timo(int timeout)
{
+#ifndef SMALL_KERNEL
+ return;
+#endif /* SMALL_KERNEL */
nd6_rs_output_timeout = timeout;
timeout_add_sec(&nd6_rs_output_timer, nd6_rs_output_timeout);
}
@@ -381,6 +384,10 @@ nd6_ra_input(struct mbuf *m, int off, int icmp6len)
if (ifp == NULL)
goto freeit;
+#ifndef SMALL_KERNEL
+ goto freeit;
+#endif /* SMALL_KERNEL */
+
/* We accept RAs only if inet6 autoconf is enabled */
if (!(ifp->if_xflags & IFXF_AUTOCONF6))
goto freeit;