As noticed by djm it doesn't make much sense to expose this in sysctl(8)
output.
ok?
Index: sbin/sysctl/sysctl.8
===================================================================
RCS file: /cvs/src/sbin/sysctl/sysctl.8,v
retrieving revision 1.193
diff -u -p -r1.193 sysctl.8
--- sbin/sysctl/sysctl.8 31 Mar 2016 15:53:25 -0000 1.193
+++ sbin/sysctl/sysctl.8 18 May 2016 22:17:40 -0000
@@ -295,7 +295,6 @@ and a few require a kernel compiled with
.It net.inet6.ip6.defmcasthlim Ta integer Ta yes
.It net.inet6.ip6.use_deprecated Ta integer Ta yes
.It net.inet6.ip6.rr_prune Ta integer Ta yes
-.It net.inet6.ip6.v6only Ta integer Ta no
.It net.inet6.ip6.maxfrags Ta integer Ta yes
.It net.inet6.ip6.mforwarding Ta integer Ta yes
.It net.inet6.ip6.multipath Ta integer Ta yes
Index: sys/netinet6/in6.h
===================================================================
RCS file: /cvs/src/sys/netinet6/in6.h,v
retrieving revision 1.87
diff -u -p -r1.87 in6.h
--- sys/netinet6/in6.h 3 Dec 2015 10:34:24 -0000 1.87
+++ sys/netinet6/in6.h 18 May 2016 22:17:40 -0000
@@ -577,8 +577,7 @@ ifatoia6(struct ifaddr *ifa)
#define IPV6CTL_DEFMCASTHLIM 18
#define IPV6CTL_USE_DEPRECATED 21 /* use deprecated addr (RFC2462 5.5.4)
*/
#define IPV6CTL_RR_PRUNE 22 /* walk timer for router renumbering */
-#define IPV6CTL_V6ONLY 24
-/* 25 to 40: resrved */
+/* 24 to 40: reserved */
#define IPV6CTL_MAXFRAGS 41 /* max fragments */
#define IPV6CTL_MFORWARDING 42
#define IPV6CTL_MULTIPATH 43
@@ -622,7 +621,7 @@ ifatoia6(struct ifaddr *ifa)
{ "use_deprecated", CTLTYPE_INT }, \
{ "rr_prune", CTLTYPE_INT }, \
{ 0, 0 }, \
- { "v6only", CTLTYPE_INT }, \
+ { 0, 0 }, \
{ 0, 0 }, \
{ 0, 0 }, \
{ 0, 0 }, \
Index: sys/netinet6/in6_proto.c
===================================================================
RCS file: /cvs/src/sys/netinet6/in6_proto.c,v
retrieving revision 1.84
diff -u -p -r1.84 in6_proto.c
--- sys/netinet6/in6_proto.c 3 Dec 2015 21:57:59 -0000 1.84
+++ sys/netinet6/in6_proto.c 18 May 2016 22:17:40 -0000
@@ -282,7 +282,6 @@ int ip6_use_deprecated = 1; /* allow dep
int ip6_rr_prune = 5; /* router renumbering prefix
* walk list every 5 sec. */
int ip6_mcast_pmtu = 0; /* enable pMTU discovery for multicast? */
-const int ip6_v6only = 1;
int ip6_neighborgcthresh = 2048; /* Threshold # of NDP entries for GC */
int ip6_maxifprefixes = 16; /* Max acceptable prefixes via RA per IF */
int ip6_maxifdefrouters = 16; /* Max acceptable def routers via RA */
Index: sys/netinet6/ip6_input.c
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_input.c,v
retrieving revision 1.159
diff -u -p -r1.159 ip6_input.c
--- sys/netinet6/ip6_input.c 7 May 2016 09:58:06 -0000 1.159
+++ sys/netinet6/ip6_input.c 18 May 2016 22:17:40 -0000
@@ -1369,8 +1369,6 @@ ip6_sysctl(int *name, u_int namelen, voi
return (ENOTDIR);
switch (name[0]) {
- case IPV6CTL_V6ONLY:
- return sysctl_rdint(oldp, oldlenp, newp, ip6_v6only);
case IPV6CTL_DAD_PENDING:
return sysctl_rdint(oldp, oldlenp, newp, ip6_dad_pending);
case IPV6CTL_STATS:
Index: sys/netinet6/ip6_output.c
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_output.c,v
retrieving revision 1.206
diff -u -p -r1.206 ip6_output.c
--- sys/netinet6/ip6_output.c 29 Apr 2016 11:40:27 -0000 1.206
+++ sys/netinet6/ip6_output.c 18 May 2016 22:17:40 -0000
@@ -1237,11 +1237,11 @@ do { \
error = EINVAL;
break;
}
- if ((ip6_v6only && optval) ||
- (!ip6_v6only && !optval))
- error = 0;
- else
+ /* No support for IPv4-mapped
addresses. */
+ if (!optval)
error = EINVAL;
+ else
+ error = 0;
break;
case IPV6_RECVTCLASS:
OPTSET(IN6P_TCLASS);
@@ -1493,7 +1493,7 @@ do { \
break;
case IPV6_V6ONLY:
- optval = (ip6_v6only != 0); /* XXX */
+ optval = 1;
break;
case IPV6_PORTRANGE:
Index: sys/netinet6/ip6_var.h
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_var.h,v
retrieving revision 1.58
diff -u -p -r1.58 ip6_var.h
--- sys/netinet6/ip6_var.h 27 Apr 2016 21:14:29 -0000 1.58
+++ sys/netinet6/ip6_var.h 18 May 2016 22:17:40 -0000
@@ -222,7 +222,6 @@ extern int ip6_use_deprecated; /* allow
extern int ip6_rr_prune; /* router renumbering prefix
* walk list every 5 sec. */
extern int ip6_mcast_pmtu; /* path MTU discovery for multicast */
-extern const int ip6_v6only;
extern int ip6_neighborgcthresh; /* Threshold # of NDP entries for GC */
extern int ip6_maxifprefixes; /* Max acceptable prefixes via RA per IF */
extern int ip6_maxifdefrouters; /* Max acceptable def routers via RA */
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
