Module Name: src
Committed By: ozaki-r
Date: Fri Oct 18 04:33:53 UTC 2019
Modified Files:
src/sys/netinet6: in6_ifattach.c in6_var.h ip6_input.c
Log Message:
in6: reset the temporary address timer on a change of the interval period
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.101 -r1.102 src/sys/netinet6/in6_var.h
cvs rdiff -u -r1.213 -r1.214 src/sys/netinet6/ip6_input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.116 src/sys/netinet6/in6_ifattach.c:1.117
--- src/sys/netinet6/in6_ifattach.c:1.116 Wed Oct 16 07:40:40 2019
+++ src/sys/netinet6/in6_ifattach.c Fri Oct 18 04:33:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.116 2019/10/16 07:40:40 ozaki-r Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.117 2019/10/18 04:33:53 ozaki-r Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.116 2019/10/16 07:40:40 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.117 2019/10/18 04:33:53 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,6 @@ static int get_ifid(struct ifnet *, stru
static int in6_ifattach_linklocal(struct ifnet *, struct ifnet *);
static int in6_ifattach_loopback(struct ifnet *);
-static void in6_tmpaddrtimer_schedule(void);
static void in6_tmpaddrtimer(void *);
#define EUI64_GBIT 0x01
@@ -861,7 +860,7 @@ in6_tmpaddrtimer_init(void)
in6_tmpaddrtimer_schedule();
}
-static void
+void
in6_tmpaddrtimer_schedule(void)
{
Index: src/sys/netinet6/in6_var.h
diff -u src/sys/netinet6/in6_var.h:1.101 src/sys/netinet6/in6_var.h:1.102
--- src/sys/netinet6/in6_var.h:1.101 Wed Oct 16 07:40:40 2019
+++ src/sys/netinet6/in6_var.h Fri Oct 18 04:33:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_var.h,v 1.101 2019/10/16 07:40:40 ozaki-r Exp $ */
+/* $NetBSD: in6_var.h,v 1.102 2019/10/18 04:33:53 ozaki-r Exp $ */
/* $KAME: in6_var.h,v 1.81 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -734,6 +734,8 @@ struct in6pcb;
void in6_sysctl_multicast_setup(struct sysctllog **);
+void in6_tmpaddrtimer_schedule(void);
+
#endif /* _KERNEL */
#endif /* !_NETINET6_IN6_VAR_H_ */
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.213 src/sys/netinet6/ip6_input.c:1.214
--- src/sys/netinet6/ip6_input.c:1.213 Wed Oct 16 07:41:28 2019
+++ src/sys/netinet6/ip6_input.c Fri Oct 18 04:33:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.213 2019/10/16 07:41:28 ozaki-r Exp $ */
+/* $NetBSD: ip6_input.c,v 1.214 2019/10/18 04:33:53 ozaki-r Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.213 2019/10/16 07:41:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.214 2019/10/18 04:33:53 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -1550,6 +1550,8 @@ sysctl_net_inet6_ip6_temppltime(SYSCTLFN
ip6_temp_preferred_lifetime = pltime;
+ in6_tmpaddrtimer_schedule();
+
return 0;
}
