Module Name: src
Committed By: ozaki-r
Date: Mon Feb 27 05:41:37 UTC 2017
Modified Files:
src/usr.sbin/rtadvd: config.c rtadvd.h
Log Message:
Fix the default value of rltime
According to rtadvd.conf(5), the default value of rltime is 1800 seconds.
PR bin/51994
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/rtadvd/config.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/rtadvd/rtadvd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rtadvd/config.c
diff -u src/usr.sbin/rtadvd/config.c:1.35 src/usr.sbin/rtadvd/config.c:1.36
--- src/usr.sbin/rtadvd/config.c:1.35 Wed Nov 11 07:48:41 2015
+++ src/usr.sbin/rtadvd/config.c Mon Feb 27 05:41:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.35 2015/11/11 07:48:41 ozaki-r Exp $ */
+/* $NetBSD: config.c,v 1.36 2017/02/27 05:41:36 ozaki-r Exp $ */
/* $KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $ */
/*
@@ -305,7 +305,7 @@ getconfig(const char *intface, int exith
goto errexit;
}
- MAYHAVE(val, "rltime", tmp->maxinterval * 3);
+ MAYHAVE(val, "rltime", DEF_ADVROUTERLIFETIME);
if (val && (val < tmp->maxinterval || val > MAXROUTERLIFETIME)) {
syslog(LOG_ERR,
"<%s> router lifetime (%d) on %s is invalid "
Index: src/usr.sbin/rtadvd/rtadvd.h
diff -u src/usr.sbin/rtadvd/rtadvd.h:1.14 src/usr.sbin/rtadvd/rtadvd.h:1.15
--- src/usr.sbin/rtadvd/rtadvd.h:1.14 Fri Jun 5 14:09:20 2015
+++ src/usr.sbin/rtadvd/rtadvd.h Mon Feb 27 05:41:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rtadvd.h,v 1.14 2015/06/05 14:09:20 roy Exp $ */
+/* $NetBSD: rtadvd.h,v 1.15 2017/02/27 05:41:36 ozaki-r Exp $ */
/* $KAME: rtadvd.h,v 1.30 2005/10/17 14:40:02 suz Exp $ */
/*
@@ -52,6 +52,7 @@ extern struct sockaddr_in6 sin6_siteloca
#define DEF_ADVCURHOPLIMIT 64
#define DEF_ADVVALIDLIFETIME 2592000
#define DEF_ADVPREFERREDLIFETIME 604800
+#define DEF_ADVROUTERLIFETIME 1800
#define MAXROUTERLIFETIME 9000
#define MIN_MAXINTERVAL 4
