summaryrefslogtreecommitdiff
path: root/sys/netinet6/in6.c
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2006-05-27 23:40:28 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2006-05-27 23:40:28 +0000
commitffb047ab64e1f172ef9a9ae36b8a06fdb69ef5f1 (patch)
tree6a78948349036845e06312619666ba18ce585a6d /sys/netinet6/in6.c
parenteb1ca9bf83835afa564afb5fe71fde464a770b69 (diff)
Do the same thing as for IPv4. Use a sysctl to enable/disable mfrowarding
and additionaly make the code part of the MROUTING option. Put it in deraadt@
Diffstat (limited to 'sys/netinet6/in6.c')
-rw-r--r--sys/netinet6/in6.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 734a1993cee..f576d02319a 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6.c,v 1.65 2006/04/16 19:09:56 canacar Exp $ */
+/* $OpenBSD: in6.c,v 1.66 2006/05/27 23:40:27 claudio Exp $ */
/* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */
/*
@@ -87,7 +87,9 @@
#include <netinet6/ip6_var.h>
#include <netinet6/nd6.h>
#include <netinet6/mld6_var.h>
+#ifdef MROUTING
#include <netinet6/ip6_mroute.h>
+#endif
#include <netinet6/in6_ifattach.h>
/* backward compatibility for a while... */
@@ -335,11 +337,13 @@ in6_control(so, cmd, data, ifp, p)
if ((so->so_state & SS_PRIV) != 0)
privileged++;
+#ifdef MROUTING
switch (cmd) {
case SIOCGETSGCNT_IN6:
case SIOCGETMIFCNT_IN6:
return (mrt6_ioctl(cmd, data));
}
+#endif
if (ifp == NULL)
return (EOPNOTSUPP);