CVS commit: [netbsd-6] src/usr.sbin/rtadvd
Module Name:src Committed By: snj Date: Fri Jul 14 06:19:58 UTC 2017 Modified Files: src/usr.sbin/rtadvd [netbsd-6]: config.c rtadvd.h Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1440): usr.sbin/rtadvd/rtadvd.h: revision 1.15 usr.sbin/rtadvd/config.c: revision 1.36 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.27.2.1 -r1.27.2.2 src/usr.sbin/rtadvd/config.c cvs rdiff -u -r1.11 -r1.11.2.1 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.
CVS commit: [netbsd-6] src/usr.sbin/rtadvd
Module Name:src Committed By: snj Date: Fri Jul 14 06:19:58 UTC 2017 Modified Files: src/usr.sbin/rtadvd [netbsd-6]: config.c rtadvd.h Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #1440): usr.sbin/rtadvd/rtadvd.h: revision 1.15 usr.sbin/rtadvd/config.c: revision 1.36 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.27.2.1 -r1.27.2.2 src/usr.sbin/rtadvd/config.c cvs rdiff -u -r1.11 -r1.11.2.1 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.27.2.1 src/usr.sbin/rtadvd/config.c:1.27.2.2 --- src/usr.sbin/rtadvd/config.c:1.27.2.1 Wed Aug 8 15:37:49 2012 +++ src/usr.sbin/rtadvd/config.c Fri Jul 14 06:19:58 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: config.c,v 1.27.2.1 2012/08/08 15:37:49 martin Exp $ */ +/* $NetBSD: config.c,v 1.27.2.2 2017/07/14 06:19:58 snj Exp $ */ /* $KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $ */ /* @@ -229,7 +229,7 @@ getconfig(const char *intface) exit(1); } - 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.11 src/usr.sbin/rtadvd/rtadvd.h:1.11.2.1 --- src/usr.sbin/rtadvd/rtadvd.h:1.11 Sat Dec 10 19:14:29 2011 +++ src/usr.sbin/rtadvd/rtadvd.h Fri Jul 14 06:19:58 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: rtadvd.h,v 1.11 2011/12/10 19:14:29 roy Exp $ */ +/* $NetBSD: rtadvd.h,v 1.11.2.1 2017/07/14 06:19:58 snj Exp $ */ /* $KAME: rtadvd.h,v 1.30 2005/10/17 14:40:02 suz Exp $ */ /* @@ -50,6 +50,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
CVS commit: [netbsd-6] src/usr.sbin/rtadvd
Module Name:src Committed By: martin Date: Wed Aug 8 15:37:49 UTC 2012 Modified Files: src/usr.sbin/rtadvd [netbsd-6]: config.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #465): usr.sbin/rtadvd/config.c: revision 1.28 Fix a bug that incorrect RA packet is sent if rtadvd.conf exists. Fixes PR#46580 reported by Takahiro HAYASHI. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.27.2.1 src/usr.sbin/rtadvd/config.c 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.27 src/usr.sbin/rtadvd/config.c:1.27.2.1 --- src/usr.sbin/rtadvd/config.c:1.27 Sun Dec 11 20:44:44 2011 +++ src/usr.sbin/rtadvd/config.c Wed Aug 8 15:37:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: config.c,v 1.27 2011/12/11 20:44:44 christos Exp $ */ +/* $NetBSD: config.c,v 1.27.2.1 2012/08/08 15:37:49 martin Exp $ */ /* $KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $ */ /* @@ -290,7 +290,7 @@ getconfig(const char *intface) MAYHAVE(val, clockskew, 0); tmp-clockskew = val; - tmp-pfxs++; + tmp-pfxs = 0; TAILQ_INIT(tmp-prefix); for (i = -1; i MAXPREFIX; i++) { struct prefix *pfx; @@ -763,6 +763,7 @@ get_prefix(struct rainfo *rai) /* link into chain */ TAILQ_INSERT_TAIL(rai-prefix, pp, next); + rai-pfxs++; } freeifaddrs(ifap);
CVS commit: [netbsd-6] src/usr.sbin/rtadvd
Module Name:src Committed By: martin Date: Wed Aug 8 15:37:49 UTC 2012 Modified Files: src/usr.sbin/rtadvd [netbsd-6]: config.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #465): usr.sbin/rtadvd/config.c: revision 1.28 Fix a bug that incorrect RA packet is sent if rtadvd.conf exists. Fixes PR#46580 reported by Takahiro HAYASHI. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.27.2.1 src/usr.sbin/rtadvd/config.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.