We don't support Router Renumbering (RFC2894).
ok?
Index: lib/libc/gen/sysctl.3
===================================================================
RCS file: /cvs/src/lib/libc/gen/sysctl.3,v
retrieving revision 1.259
diff -u -p -r1.259 sysctl.3
--- lib/libc/gen/sysctl.3 29 May 2016 17:01:07 -0000 1.259
+++ lib/libc/gen/sysctl.3 1 Jun 2016 00:21:08 -0000
@@ -1676,7 +1676,6 @@ The currently defined protocols and name
.It ip6 Ta multipath Ta integer Ta yes
.It ip6 Ta neighborgcthresh Ta integer Ta yes
.It ip6 Ta redirect Ta integer Ta yes
-.It ip6 Ta rr_prune Ta integer Ta yes
.It ip6 Ta use_deprecated Ta integer Ta yes
.El
.Pp
@@ -1871,10 +1870,6 @@ The default value is 2048.
Returns 1 when ICMPv6 redirects may be sent by the node.
This option is ignored unless the node is routing IP packets,
and should normally be enabled on all systems.
-.Pp
-.It Li ip6.rr_prune
-This variable specifies the interval between IPv6 router renumbering prefix
-babysitting in seconds.
.Pp
.It Li ip6.use_deprecated
This variable controls the use of deprecated addresses, specified in
Index: sbin/sysctl/sysctl.8
===================================================================
RCS file: /cvs/src/sbin/sysctl/sysctl.8,v
retrieving revision 1.196
diff -u -p -r1.196 sysctl.8
--- sbin/sysctl/sysctl.8 29 May 2016 17:01:07 -0000 1.196
+++ sbin/sysctl/sysctl.8 1 Jun 2016 00:21:08 -0000
@@ -295,7 +295,6 @@ and a few require a kernel compiled with
.It net.inet6.ip6.auto_flowlabel Ta integer Ta yes
.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.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.88
diff -u -p -r1.88 in6.h
--- sys/netinet6/in6.h 19 May 2016 11:34:39 -0000 1.88
+++ sys/netinet6/in6.h 1 Jun 2016 00:21:08 -0000
@@ -576,7 +576,6 @@ ifatoia6(struct ifaddr *ifa)
#define IPV6CTL_AUTO_FLOWLABEL 17
#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 */
/* 24 to 40: reserved */
#define IPV6CTL_MAXFRAGS 41 /* max fragments */
#define IPV6CTL_MFORWARDING 42
@@ -619,7 +618,7 @@ ifatoia6(struct ifaddr *ifa)
{ 0, 0 }, \
{ 0, 0 }, \
{ "use_deprecated", CTLTYPE_INT }, \
- { "rr_prune", CTLTYPE_INT }, \
+ { 0, 0 }, \
{ 0, 0 }, \
{ 0, 0 }, \
{ 0, 0 }, \
@@ -676,7 +675,7 @@ ifatoia6(struct ifaddr *ifa)
NULL, \
NULL, \
&ip6_use_deprecated, \
- &ip6_rr_prune, \
+ NULL, \
NULL, \
NULL, \
NULL, \
Index: sys/netinet6/in6_proto.c
===================================================================
RCS file: /cvs/src/sys/netinet6/in6_proto.c,v
retrieving revision 1.85
diff -u -p -r1.85 in6_proto.c
--- sys/netinet6/in6_proto.c 19 May 2016 11:34:40 -0000 1.85
+++ sys/netinet6/in6_proto.c 1 Jun 2016 00:21:08 -0000
@@ -279,8 +279,6 @@ int ip6_dad_count = 1; /* DupAddrDetecti
int ip6_dad_pending; /* number of currently running DADs */
int ip6_auto_flowlabel = 1;
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_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 */
Index: sys/netinet6/ip6_var.h
===================================================================
RCS file: /cvs/src/sys/netinet6/ip6_var.h,v
retrieving revision 1.59
diff -u -p -r1.59 ip6_var.h
--- sys/netinet6/ip6_var.h 19 May 2016 11:34:40 -0000 1.59
+++ sys/netinet6/ip6_var.h 1 Jun 2016 00:21:08 -0000
@@ -219,8 +219,6 @@ extern int ip6_mforwarding; /* act as mu
extern int ip6_multipath; /* use multipath routes */
extern int ip6_sendredirect; /* send ICMPv6 redirect? */
extern int ip6_use_deprecated; /* allow deprecated addr as source */
-extern int ip6_rr_prune; /* router renumbering prefix
- * walk list every 5 sec. */
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 */
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
