[src/trunk]: src Toggle the default value of ip6_v6only. Also provide a samp...

[briggs <briggs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/40145d1760d9
branches:  trunk
changeset: 554432:40145d1760d9
user:      briggs <briggs%NetBSD.org@localhost>
date:      Tue Oct 28 06:31:28 2003 +0000

description:
Toggle the default value of ip6_v6only.  Also provide a sample sysctl to
retain the existing behavior.

diffstat:

 etc/sysctl.conf          |  6 +++++-
 sys/netinet6/in6_proto.c |  6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r b8865b4af816 -r 40145d1760d9 etc/sysctl.conf
--- a/etc/sysctl.conf   Tue Oct 28 04:59:18 2003 +0000
+++ b/etc/sysctl.conf   Tue Oct 28 06:31:28 2003 +0000
@@ -1,6 +1,6 @@
 #!/sbin/sysctl -f
 #
-# $NetBSD: sysctl.conf,v 1.3 2000/04/15 21:14:49 tsarna Exp $
+# $NetBSD: sysctl.conf,v 1.4 2003/10/28 06:31:28 briggs Exp $
 #
 # sysctl(8) variables to set at boot time.
 
@@ -9,3 +9,7 @@
 
 # Number of kernel threads to use for NFS client
 #vfs.nfs.iothreads=4
+
+# Do not allow IPv4 packet to be delivered to AF_INET6 sockets
+# ftp://ftp.itojun.org/pub/paper/draft-cmetz-v6ops-v4mapped-api-harmful-00.txt
+#net.inet6.ip6.v6only=1
diff -r b8865b4af816 -r 40145d1760d9 sys/netinet6/in6_proto.c
--- a/sys/netinet6/in6_proto.c  Tue Oct 28 04:59:18 2003 +0000
+++ b/sys/netinet6/in6_proto.c  Tue Oct 28 06:31:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_proto.c,v 1.53 2003/09/06 03:36:32 itojun Exp $    */
+/*     $NetBSD: in6_proto.c,v 1.54 2003/10/28 06:31:28 briggs Exp $    */
 /*     $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $      */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.53 2003/09/06 03:36:32 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_proto.c,v 1.54 2003/10/28 06:31:28 briggs Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -266,7 +266,7 @@
 int    ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */
 int    ip6_rr_prune = 5;       /* router renumbering prefix
                                 * walk list every 5 sec. */
-int    ip6_v6only = 1;
+int    ip6_v6only = 0;
 
 int    ip6_keepfaith = 0;
 time_t ip6_log_time = (time_t)0L;