diff options
| -rw-r--r-- | lib/libc/gen/sysctl.3 | 17 | ||||
| -rw-r--r-- | sys/netinet6/in6.h | 12 | ||||
| -rw-r--r-- | sys/netinet6/in6_proto.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_var.h | 4 |
4 files changed, 9 insertions, 28 deletions
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3 index 0ac92a5c079..bb0317d7187 100644 --- a/lib/libc/gen/sysctl.3 +++ b/lib/libc/gen/sysctl.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysctl.3,v 1.279 2017/05/04 20:41:10 tb Exp $ +.\" $OpenBSD: sysctl.3,v 1.280 2017/07/13 17:17:27 florian Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 4 2017 $ +.Dd $Mdocdate: July 13 2017 $ .Dt SYSCTL 3 .Os .Sh NAME @@ -1654,8 +1654,6 @@ The currently defined protocols and names are: .It ip6 Ta maxdynroutes Ta integer Ta yes .It ip6 Ta maxfragpackets Ta integer Ta yes .It ip6 Ta maxfrags Ta integer Ta yes -.It ip6 Ta maxifprefixes Ta integer Ta yes -.It ip6 Ta maxifdefrouters Ta integer Ta yes .It ip6 Ta mforwarding Ta integer Ta yes .It ip6 Ta mtudisctimeout Ta integer Ta yes .It ip6 Ta multicast_mtudisc Ta integer Ta yes @@ -1814,17 +1812,6 @@ The maximum number of fragments the node will accept. \-1 means that the node will accept as many fragments as it receives. The flag is provided basically for avoiding possible DoS attacks. .Pp -.It Li ip6.maxifprefixes Pq Va net.inet6.ip6.maxifprefixes -Maximum number of prefixes created by route advertisements per interface. -Set to negative to disable. -The default value is 16. -.Pp -.It Li ip6.maxifdefrouters Pq Va net.inet6.ip6.maxifdefrouters -Maximum number of default routers created by route advertisements per -interface. -Set to negative to disable. -The default value is 16. -.Pp .It Li ip6.mforwarding Pq Va net.inet6.ip6.mforwarding If set to 1, then multicast forwarding is enabled for the host. The default is 0. diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 1aac6581916..ac0120e4217 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.h,v 1.96 2017/05/30 09:10:49 mpi Exp $ */ +/* $OpenBSD: in6.h,v 1.97 2017/07/13 17:17:27 florian Exp $ */ /* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */ /* @@ -584,8 +584,6 @@ ifatoia6(struct ifaddr *ifa) #define IPV6CTL_MULTIPATH 43 #define IPV6CTL_MCAST_PMTU 44 /* path MTU discovery for multicast */ #define IPV6CTL_NEIGHBORGCTHRESH 45 -#define IPV6CTL_MAXIFPREFIXES 46 -#define IPV6CTL_MAXIFDEFROUTERS 47 #define IPV6CTL_MAXDYNROUTES 48 #define IPV6CTL_DAD_PENDING 49 #define IPV6CTL_MTUDISCTIMEOUT 50 @@ -644,8 +642,8 @@ ifatoia6(struct ifaddr *ifa) { "multipath", CTLTYPE_INT }, \ { "multicast_mtudisc", CTLTYPE_INT }, \ { "neighborgcthresh", CTLTYPE_INT }, \ - { "maxifprefixes", CTLTYPE_INT }, \ - { "maxifdefrouters", CTLTYPE_INT }, \ + { 0, 0 }, \ + { 0, 0 }, \ { "maxdynroutes", CTLTYPE_INT }, \ { "dad_pending", CTLTYPE_INT }, \ { "mtudisctimeout", CTLTYPE_INT }, \ @@ -701,8 +699,8 @@ ifatoia6(struct ifaddr *ifa) &ip6_multipath, \ &ip6_mcast_pmtu, \ &ip6_neighborgcthresh, \ - &ip6_maxifprefixes, \ - &ip6_maxifdefrouters, \ + NULL, \ + NULL, \ &ip6_maxdynroutes, \ NULL, \ NULL, \ diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index e2294ed1cb4..2a653e0286e 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_proto.c,v 1.94 2017/05/18 10:56:45 bluhm Exp $ */ +/* $OpenBSD: in6_proto.c,v 1.95 2017/07/13 17:17:27 florian Exp $ */ /* $KAME: in6_proto.c,v 1.66 2000/10/10 15:35:47 itojun Exp $ */ /* @@ -360,8 +360,6 @@ int ip6_auto_flowlabel = 1; int ip6_use_deprecated = 1; /* allow deprecated addr (RFC2462 5.5.4) */ int ip6_mcast_pmtu = 0; /* enable pMTU discovery for multicast? */ 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 */ int ip6_maxdynroutes = 4096; /* Max # of routes created via redirect */ time_t ip6_log_time = (time_t)0L; diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index 9b58d9ee0af..2b9f86cab2f 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_var.h,v 1.77 2017/07/05 11:34:10 bluhm Exp $ */ +/* $OpenBSD: ip6_var.h,v 1.78 2017/07/13 17:17:27 florian Exp $ */ /* $KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $ */ /* @@ -279,8 +279,6 @@ extern int ip6_sendredirect; /* send ICMPv6 redirect? */ extern int ip6_use_deprecated; /* allow deprecated addr as source */ extern int ip6_mcast_pmtu; /* path MTU discovery for multicast */ 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 */ extern int ip6_maxdynroutes; /* Max # of routes created via redirect */ extern struct socket *ip6_mrouter[RT_TABLEID_MAX]; /* multicast routing daemon */ |