Fix the default value of rltime

According to rtadvd.conf(5), the default value of rltime is 1800 seconds.

PR bin/51994
This commit is contained in:
ozaki-r 2017-02-27 05:41:36 +00:00
parent 8aea78d688
commit cd58b07d6c
2 changed files with 4 additions and 3 deletions

View File

@ -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 exithard)
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 "

View File

@ -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_sitelocal_allrouters;
#define DEF_ADVCURHOPLIMIT 64
#define DEF_ADVVALIDLIFETIME 2592000
#define DEF_ADVPREFERREDLIFETIME 604800
#define DEF_ADVROUTERLIFETIME 1800
#define MAXROUTERLIFETIME 9000
#define MIN_MAXINTERVAL 4