 @@ -1,14 +1,14 @@
-/*	$NetBSD: icmp6.h,v 1.43 2011/11/11 15:09:32 gdt Exp $	*/
+/*	$NetBSD: icmp6.h,v 1.44 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: icmp6.h,v 1.84 2003/04/23 10:26:51 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -290,31 +290,30 @@ struct nd_opt_hdr {		/* Neighbor discove
 	u_int8_t	nd_opt_len;
 	/* followed by option specific data*/
 } __packed;
 #define ND_OPT_SOURCE_LINKADDR		1
 #define ND_OPT_TARGET_LINKADDR		2
 #define ND_OPT_PREFIX_INFORMATION	3
 #define ND_OPT_REDIRECTED_HEADER	4
 #define ND_OPT_MTU			5
 #define ND_OPT_ADVINTERVAL		7
 #define ND_OPT_HOMEAGENT_INFO		8
 #define ND_OPT_SOURCE_ADDRLIST		9
 #define ND_OPT_TARGET_ADDRLIST		10
-/* RFC5380 */
+#define ND_OPT_MAP			23	/* RFC 5380 */
-#define ND_OPT_MAP			23
+#define ND_OPT_ROUTE_INFO		24	/* RFC 4191 */
-/* RFC4191 */
+#define ND_OPT_RDNSS			25	/* RFC 6016 */
-#define ND_OPT_ROUTE_INFO		24
+#define ND_OPT_DNSSL			31	/* RFC 6016 */
 #define ND_OPT_RDNSS			25
 struct nd_opt_route_info {	/* route info */
 	u_int8_t	nd_opt_rti_type;
 	u_int8_t	nd_opt_rti_len;
 	u_int8_t	nd_opt_rti_prefixlen;
 	u_int8_t	nd_opt_rti_flags;
 	u_int32_t	nd_opt_rti_lifetime;
 	/* prefix follows */
 };
 struct nd_opt_prefix_info {	/* prefix information */
 	u_int8_t	nd_opt_pi_type;
 	u_int8_t	nd_opt_pi_len;
 @@ -334,34 +333,42 @@ struct nd_opt_rd_hdr {		/* redirected he
 	u_int8_t	nd_opt_rh_len;
 	u_int16_t	nd_opt_rh_reserved1;
 	u_int32_t	nd_opt_rh_reserved2;
 	/* followed by IP header and data */
 } __packed;
 struct nd_opt_mtu {		/* MTU option */
 	u_int8_t	nd_opt_mtu_type;
 	u_int8_t	nd_opt_mtu_len;
 	u_int16_t	nd_opt_mtu_reserved;
 	u_int32_t	nd_opt_mtu_mtu;
 } __packed;
-struct nd_opt_rdnss {		/* RDNSS option RFC 5006 */
+struct nd_opt_rdnss {		/* RDNSS option RFC 6106 */
 	u_int8_t	nd_opt_rdnss_type;
 	u_int8_t	nd_opt_rdnss_len;
 	u_int16_t	nd_opt_rdnss_reserved;
 	u_int32_t	nd_opt_rdnss_lifetime;
 	/* followed by list of IP prefixes */
 } __packed;
 struct nd_opt_dnssl {		/* DNSSL option RFC 6106 */
 	u_int8_t	nd_opt_dnssl_type;
 	u_int8_t	nd_opt_dnssl_len;
 	u_int16_t	nd_opt_dnssl_reserved;
 	u_int32_t	nd_opt_dnssl_lifetime;
 	/* followed by list of IP prefixes */
 } __packed;
 /*
  * icmp6 namelookup
  */
 struct icmp6_namelookup {
 	struct icmp6_hdr 	icmp6_nl_hdr;
 	u_int8_t	icmp6_nl_nonce[8];
 	int32_t		icmp6_nl_ttl;
 #if 0
 	u_int8_t	icmp6_nl_len;
 	u_int8_t	icmp6_nl_name[3];
 #endif
 	/* could be followed by options */

 @@ -1,25 +1,25 @@
-# $NetBSD: Makefile,v 1.15 2011/06/20 07:44:04 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2011/12/10 19:14:29 roy Exp $
-WARNS?=	2	# XXX -Wcast-qual -Wsign-compare
+WARNS?=	4
 .include <bsd.own.mk>
 USE_FORT?= yes	# network server
 PROG=	rtadvd
 SRCS=	rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c
-CPPFLAGS+=-DINET6 -DROUTEINFO
+CPPFLAGS+=-DINET6
 MAN=	rtadvd.8 rtadvd.conf.5
 LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
 .if ${MKSHARE} != "no"
 FILESDIR=	/usr/share/examples/rtadvd
 FILES=	rtadvd.conf
 .endif
 .include <bsd.prog.mk>
 .if defined(HAVE_GCC)
 COPTS.dump.c=-fno-strict-aliasing

 @@ -1,14 +1,14 @@
-/*	$NetBSD: advcap.c,v 1.12 2006/03/18 22:07:15 dan Exp $	*/
+/*	$NetBSD: advcap.c,v 1.13 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: advcap.c,v 1.11 2003/05/19 09:46:50 keiichi Exp $	*/
 /*
  * Copyright (c) 1983 The Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -77,54 +77,52 @@ char	*RM;
+ *
  * Essentially all the work here is scanning and decoding escapes
  * in string capabilities.  We don't use stdio because the editor
  * doesn't, and because living w/o it is not hard.
  */
 static	char *tbuf;
 static	int hopcount;	/* detect infinite loops in termcap, init 0 */
 static	char *remotefile;
 extern char *conffile;
-int tgetent __P((char *, char *));
+int tgetent(char *, char *);
-int getent __P((char *, char *, char *));
+int getent(char *, char *, char *);
-int tnchktc __P((void));
+int tnchktc(void);
-int tnamatch __P((char *));
+int tnamatch(char *);
-static char *tskip __P((char *));
+static char *tskip(char *);
-int64_t tgetnum __P((char *));
+int64_t tgetnum(char *);
-int tgetflag __P((char *));
+int tgetflag(char *);
-char *tgetstr __P((char *, char **));
+char *tgetstr(char *, char **);
-static char *tdecode __P((char *, char **));
+static char *tdecode(char *, char **);
 /*
  * Get an entry for terminal name in buffer bp,
  * from the termcap file.  Parse is very rudimentary;
  * we just notice escaped newlines.
  */
 int
-tgetent(bp, name)
+tgetent(char *bp, char *name)
 	char *bp, *name;
+{
 	char *cp;
-	remotefile = cp = conffile ? conffile : _PATH_RTADVDCONF;
+	remotefile = cp = conffile ? conffile : __UNCONST(_PATH_RTADVDCONF);
 	return (getent(bp, name, cp));
+}
 int
-getent(bp, name, cp)
+getent(char *bp, char *name, char *cp)
 	char *bp, *name, *cp;
+{
 	int c;
 	int i = 0, cnt = 0;
 	char ibuf[BUFSIZ];
 	int tf;
 	tbuf = bp;
 	tf = 0;
 	/*
 	 * TERMCAP can have one of two things in it. It can be the
 	 * name of a file to use instead of /etc/termcap. In this
 	 * case it better start with a "/". Or it can be an entry to
 	 * use so we don't have to read the file. In this case it
 @@ -173,27 +171,27 @@ getent(bp, name, cp)
 			return (tnchktc());
+		}
+	}
+}
 /*
  * tnchktc: check the last entry, see if it's tc=xxx. If so,
  * recursively find xxx and append that entry (minus the names)
  * to take the place of the tc=xxx entry. This allows termcap
  * entries to say "like an HP2621 but doesn't turn on the labels".
  * Note that this works because of the left to right scan.
  */
 int
-tnchktc()
+tnchktc(void)
+{
 	char *p, *q;
 	char tcname[16];	/* name of similar terminal */
 	char tcbuf[BUFSIZ];
 	char *holdtbuf = tbuf;
 	int l;
 	p = tbuf + strlen(tbuf) - 2;	/* before the last colon */
 	while (*--p != ':')
 		if (p < tbuf) {
 			write(2, "Bad remcap entry\n", 18);
 			return (0);
+		}
 @@ -222,55 +220,53 @@ tnchktc()
+	}
 	strcpy(p, q);
 	tbuf = holdtbuf;
 	return (1);
+}
 /*
  * Tnamatch deals with name matching.  The first field of the termcap
  * entry is a sequence of names separated by |'s, so we compare
  * against each such name.  The normal : terminator after the last
  * name (before the first field) stops us.
  */
 int
-tnamatch(np)
+tnamatch(char *np)
 	char *np;
+{
 	char *Np, *Bp;
 	Bp = tbuf;
 	if (*Bp == '#')
 		return (0);
 	for (;;) {
 		for (Np = np; *Np && *Bp == *Np; Bp++, Np++)
 			continue;
 		if (*Np == 0 && (*Bp == '|' || *Bp == ':' || *Bp == 0))
 			return (1);
 		while (*Bp && *Bp != ':' && *Bp != '|')
 			Bp++;
 		if (*Bp == 0 || *Bp == ':')
 			return (0);
 		Bp++;
+	}
+}
 /*
  * Skip to the next field.  Notice that this is very dumb, not
  * knowing about \: escapes or any such.  If necessary, :'s can be put
  * into the termcap file in octal.
  */
 static char *
-tskip(bp)
+tskip(char *bp)
 	char *bp;
+{
 	int dquote;
 	dquote = 0;
 	while (*bp) {
 		switch (*bp) {
 		case ':':
 			if (!dquote)
 				goto breakbreak;
 			else
 				bp++;
 			break;
 		case '\\':
 @@ -294,28 +290,27 @@ breakbreak:
 		bp++;
 	return (bp);
+}
 /*
  * Return the (numeric) option id.
  * Numeric options look like
  *	li#80
  * i.e. the option string is separated from the numeric value by
  * a # character.  If the option is not found we return -1.
  * Note that we handle octal numbers beginning with 0.
  */
 int64_t
-tgetnum(id)
+tgetnum(char *id)
 	char *id;
+{
 	int64_t i;
 	int base;
 	char *bp = tbuf;
 	for (;;) {
 		bp = tskip(bp);
 		if (*bp == 0)
 			return (-1);
 		if (strncmp(bp, id, strlen(id)) != 0)
 			continue;
 		bp += strlen(id);
 		if (*bp == '@')
 @@ -330,106 +325,102 @@ tgetnum(id)
 		while (isdigit((unsigned char)*bp))
 			i *= base, i += *bp++ - '0';
 		return (i);
+	}
+}
 /*
  * Handle a flag option.
  * Flag options are given "naked", i.e. followed by a : or the end
  * of the buffer.  Return 1 if we find the option, or 0 if it is
  * not given.
  */
 int
-tgetflag(id)
+tgetflag(char *id)
 	char *id;
+{
 	char *bp = tbuf;
 	for (;;) {
 		bp = tskip(bp);
 		if (!*bp)
 			return (0);
 		if (strncmp(bp, id, strlen(id)) == 0) {
 			bp += strlen(id);
 			if (!*bp || *bp == ':')
 				return (1);
 			else if (*bp == '@')
 				return (0);
+		}
+	}
+}
 /*
  * Get a string valued option.
  * These are given as
  *	cl=^Z
  * Much decoding is done on the strings, and the strings are
  * placed in area, which is a ref parameter which is updated.
  * No checking on area overflow.
  */
 char *
-tgetstr(id, area)
+tgetstr(char *id, char **area)
 	char *id, **area;
+{
 	char *bp = tbuf;
 	for (;;) {
 		bp = tskip(bp);
 		if (!*bp)
 			return (0);
 		if (strncmp(bp, id, strlen(id)) != 0)
 			continue;
 		bp += strlen(id);
 		if (*bp == '@')
 			return (0);
 		if (*bp != '=')
 			continue;
 		bp++;
 		return (tdecode(bp, area));
+	}
+}
 /*
  * Tdecode does the grung work to decode the
  * string capability escapes.
  */
 static char *
-tdecode(str, area)
+tdecode(char *str, char **area)
 	char *str;
 	char **area;
+{
 	char *cp;
 	int c;
-	char *dp;
+	const char *dps = "E\033^^\\\\::n\nr\rt\tb\bf\f\"\"", *dp;
 	int i;
 	char term;
 	term = ':';
 	cp = *area;
 again:
 	if (*str == '"') {
 		term = '"';
 		str++;
+	}
 	while ((c = *str++) && c != term) {
 		switch (c) {
 		case '^':
 			c = *str++ & 037;
 			break;
 		case '\\':
-			dp = "E\033^^\\\\::n\nr\rt\tb\bf\f\"\"";
+			dp = dps;
 			c = *str++;
 nextc:
 			if (*dp++ == c) {
 				c = *dp++;
 				break;
+			}
 			dp++;
 			if (*dp)
 				goto nextc;
 			if (isdigit((unsigned char)c)) {
 				c -= '0', i = 2;
 				do
 					c <<= 3, c |= *str++ - '0';

 @@ -1,14 +1,14 @@
-/*	$NetBSD: advcap.h,v 1.6 2006/03/05 23:47:08 rpaulo Exp $	*/
+/*	$NetBSD: advcap.h,v 1.7 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: advcap.h,v 1.5 2003/06/09 05:40:54 t-momose Exp $	*/
 /*
  * Copyright (C) 1994,1995 by Andrey A. Chernov, Moscow, Russia.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -26,21 +26,21 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /* Based on Id: termcap.h,v 1.8 1996/09/10 12:42:10 peter Exp */
 #ifndef _ADVCAP_H_
 #define _ADVCAP_H_
 #include <sys/cdefs.h>
 __BEGIN_DECLS
-extern int agetent __P((char *, const char *));
+extern int agetent(char *, const char *);
-extern int agetflag __P((const char *));
+extern int agetflag(const char *);
-extern int64_t agetnum __P((const char *));
+extern int64_t agetnum(const char *);
-extern char *agetstr __P((const char *, char **));
+extern char *agetstr(const char *, char **);
 __END_DECLS
 #endif /* _ADVCAP_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: config.h,v 1.6 2006/03/05 23:47:08 rpaulo Exp $	*/
+/*	$NetBSD: config.h,v 1.7 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: config.h,v 1.9 2003/08/06 04:19:40 ono Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -20,28 +20,29 @@
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-extern void getconfig __P((char *));
+extern void getconfig(char *);
-extern void delete_prefix __P((struct prefix *));
+extern void delete_prefix(struct prefix *);
-extern void invalidate_prefix __P((struct prefix *));
+extern void invalidate_prefix(struct prefix *);
-extern void update_prefix __P((struct prefix *));
+extern void update_prefix(struct prefix *);
-extern void make_prefix __P((struct rainfo *, int, struct in6_addr *, int));
+extern void make_prefix(struct rainfo *, int, struct in6_addr *, int);
-extern void make_packet __P((struct rainfo *));
+extern void make_packet(struct rainfo *);
-extern void get_prefix __P((struct rainfo *));
+extern void get_prefix(struct rainfo *);
 /*
- * it is highly unlikely to have 100 prefix information options,
+ * it is highly unlikely to have 100 information options,
  * so it should be okay to limit it
  */
 #define MAXPREFIX	100
 #define MAXROUTE	100
 #define MAXRDNSS	100
 #define MAXDNSSL	100

 @@ -1,14 +1,14 @@
-/*	$NetBSD: timer.h,v 1.6 2006/03/05 23:47:08 rpaulo Exp $	*/
+/*	$NetBSD: timer.h,v 1.7 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: timer.h,v 1.5 2002/05/31 13:30:38 jinmei Exp $	*/
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -30,36 +30,36 @@
  * SUCH DAMAGE.
  */
 /* a < b */
 #define TIMEVAL_LT(a, b) (((a).tv_sec < (b).tv_sec) ||\
 			  (((a).tv_sec == (b).tv_sec) && \
 			    ((a).tv_usec < (b).tv_usec)))
 /* a <= b */
 #define TIMEVAL_LEQ(a, b) (((a).tv_sec < (b).tv_sec) ||\
 			   (((a).tv_sec == (b).tv_sec) &&\
  			    ((a).tv_usec <= (b).tv_usec)))
 extern TAILQ_HEAD(rtadvd_timer_head_t, rtadvd_timer) ra_timer;
 struct rtadvd_timer {
-	struct rtadvd_timer *next;
+	TAILQ_ENTRY(rtadvd_timer) next;
 	struct rtadvd_timer *prev;
 	struct rainfo *rai;
 	struct timeval tm;
-	struct rtadvd_timer *(*expire) __P((void *));	/* expiration function */
+	struct rtadvd_timer *(*expire) (void *); /* expiration function */
 	void *expire_data;
 	void (*update) __P((void *, struct timeval *));	/* update function */
 	void *update_data;
 };
-void rtadvd_timer_init __P((void));
+void rtadvd_timer_init(void);
-struct rtadvd_timer *rtadvd_add_timer __P((struct rtadvd_timer *(*) __P((void *)),
+struct rtadvd_timer *rtadvd_add_timer(struct rtadvd_timer *(*) (void *),
-		void (*) __P((void *, struct timeval *)), void *, void *));
+		void (*) (void *, struct timeval *), void *, void *);
-void rtadvd_set_timer __P((struct timeval *, struct rtadvd_timer *));
+void rtadvd_set_timer(struct timeval *, struct rtadvd_timer *);
-void rtadvd_remove_timer __P((struct rtadvd_timer **));
+void rtadvd_remove_timer(struct rtadvd_timer **);
-struct timeval * rtadvd_check_timer __P((void));
+struct timeval * rtadvd_check_timer(void);
-struct timeval * rtadvd_timer_rest __P((struct rtadvd_timer *));
+struct timeval * rtadvd_timer_rest(struct rtadvd_timer *);
-void TIMEVAL_ADD __P((struct timeval *, struct timeval *,
+void TIMEVAL_ADD(struct timeval *, struct timeval *,
-		      struct timeval *));
+		      struct timeval *);
-void TIMEVAL_SUB __P((struct timeval *, struct timeval *,
+void TIMEVAL_SUB(struct timeval *, struct timeval *,
-		      struct timeval *));
+		      struct timeval *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: config.c,v 1.25 2006/05/11 08:35:47 mrg Exp $	*/
+/*	$NetBSD: config.c,v 1.26 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: config.c,v 1.93 2005/10/17 14:40:02 suz Exp $	*/
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -56,82 +56,104 @@
 #include <stdlib.h>
 #include <search.h>
 #include <unistd.h>
 #include <ifaddrs.h>
 #include "rtadvd.h"
 #include "advcap.h"
 #include "timer.h"
 #include "if.h"
 #include "config.h"
 static time_t prefix_timo = (60 * 120);	/* 2 hours.
 					 * XXX: should be configurable. */
-extern struct rainfo *ralist;
+static struct rtadvd_timer *prefix_timeout(void *);
 static void makeentry(char *, size_t, int, const char *);
 static int getinet6sysctl(int);
-static struct rtadvd_timer *prefix_timeout __P((void *));
+static size_t
-static void makeentry __P((char *, size_t, int, char *));
+encode_domain(char *dst, const char *src)
 static int getinet6sysctl __P((int));
 	ssize_t len;
 	char *odst, *p;
 	odst = dst;
 	while (src && (len = strlen(src)) != 0) {
 		p = strchr(src, '.');
 		*dst++ = len = MIN(63, p == NULL ? len : p - src);
 		memcpy(dst, src, len);
 		dst += len;
 		if (p == NULL)
 			break;
 		src = p + 1;
+	}
 	*dst++ = '\0';
 	return dst - odst;
+}
 void
 getconfig(intface)
 	char *intface;
+{
-	int stat, i;
+	int stat, c, i;
 	char tbuf[BUFSIZ];
 	struct rainfo *tmp;
-	long val;
+	int32_t val;
 	int64_t val64;
 	char buf[BUFSIZ];
 	char *bp = buf;
-	char *addr, *flagstr;
+	char *addr, *flagstr, *ap;
 	static int forwarding = -1;
 	char entbuf[256], abuf[256];
 #define MUSTHAVE(var, cap)	\
     do {								\
 	int64_t t;							\
 	if ((t = agetnum(cap)) < 0) {					\
 		fprintf(stderr, "rtadvd: need %s for interface %s\n",	\
 			cap, intface);					\
 		exit(1);						\
 	}								\
 	var = t;							\
      } while (0)
 #define MAYHAVE(var, cap, def)	\
      do {								\
 	if ((var = agetnum(cap)) < 0)					\
 		var = def;						\
      } while (0)
 #define	ELM_MALLOC(p,error_action)					\
 	do {								\
 		p = malloc(sizeof(*p));					\
 		if (p == NULL) {					\
 			syslog(LOG_ERR, "<%s> malloc failed: %s",	\
 			    __func__, strerror(errno));			\
 			error_action;					\
 		}							\
 		memset(p, 0, sizeof(*p));				\
 	} while(0)
 	if ((stat = agetent(tbuf, intface)) <= 0) {
 		memset(tbuf, 0, sizeof(tbuf));
 		syslog(LOG_INFO,
 		       "<%s> %s isn't defined in the configuration file"
 		       " or the configuration file doesn't exist."
 		       " Treat it as default",
 		        __func__, intface);
+	}
-	tmp = (struct rainfo *)malloc(sizeof(*ralist));
+	ELM_MALLOC(tmp, exit(1));
 	if (tmp == NULL) {
 		syslog(LOG_INFO, "<%s> %s: can't allocate enough memory",
 		    __func__, intface);
 		exit(1);
 	memset(tmp, 0, sizeof(*tmp));
 	tmp->prefix.next = tmp->prefix.prev = &tmp->prefix;
 #ifdef ROUTEINFO
 	tmp->route.next = tmp->route.prev = &tmp->route;
 #endif
 	/* check if we are allowed to forward packets (if not determined) */
 	if (forwarding < 0) {
 		if ((forwarding = getinet6sysctl(IPV6CTL_FORWARDING)) < 0)
 			exit(1);
+	}
 	/* get interface information */
 	if (agetflag("nolladdr"))
 		tmp->advlinkopt = 0;
 	else
 		tmp->advlinkopt = 1;
 	if (tmp->advlinkopt) {
 @@ -148,42 +170,42 @@ getconfig(intface)
 	if ((tmp->phymtu = if_getmtu(intface)) == 0) {
 		tmp->phymtu = IPV6_MMTU;
 		syslog(LOG_WARNING,
 		       "<%s> can't get interface mtu of %s. Treat as %d",
 		       __func__, intface, IPV6_MMTU);
+	}
 	/*
 	 * set router configuration variables.
 	 */
 	MAYHAVE(val, "maxinterval", DEF_MAXRTRADVINTERVAL);
 	if (val < MIN_MAXINTERVAL || val > MAX_MAXINTERVAL) {
 		syslog(LOG_ERR,
-		       "<%s> maxinterval (%ld) on %s is invalid "
+		       "<%s> maxinterval (%d) on %s is invalid "
 		       "(must be between %u and %u)", __func__, val,
 		       intface, MIN_MAXINTERVAL, MAX_MAXINTERVAL);
 		exit(1);
+	}
-	tmp->maxinterval = (u_int)val;
+	tmp->maxinterval = val;
 	MAYHAVE(val, "mininterval", tmp->maxinterval/3);
 	if (val < MIN_MININTERVAL || val > (tmp->maxinterval * 3) / 4) {
 		syslog(LOG_ERR,
-		       "<%s> mininterval (%ld) on %s is invalid "
+		       "<%s> mininterval (%d) on %s is invalid "
 		       "(must be between %u and %d)",
 		       __func__, val, intface, MIN_MININTERVAL,
 		       (tmp->maxinterval * 3) / 4);
 		exit(1);
+	}
-	tmp->mininterval = (u_int)val;
+	tmp->mininterval = val;
 	MAYHAVE(val, "chlim", DEF_ADVCURHOPLIMIT);
 	tmp->hoplimit = val & 0xff;
 	if ((flagstr = (char *)agetstr("raflags", &bp))) {
 		val = 0;
 		if (strchr(flagstr, 'm'))
 			val |= ND_RA_FLAG_MANAGED;
 		if (strchr(flagstr, 'o'))
 			val |= ND_RA_FLAG_OTHER;
 		if (strchr(flagstr, 'h'))
 			val |= ND_RA_FLAG_RTPREF_HIGH;
 		if (strchr(flagstr, 'l')) {
 @@ -203,133 +225,132 @@ getconfig(intface)
 #define ND_RA_FLAG_RTPREF_MASK	0x18 /* 00011000 */
 #define ND_RA_FLAG_RTPREF_RSV	0x10 /* 00010000 */
 #endif
 	tmp->rtpref = val & ND_RA_FLAG_RTPREF_MASK;
 	if (tmp->rtpref == ND_RA_FLAG_RTPREF_RSV) {
 		syslog(LOG_ERR, "<%s> invalid router preference (%02x) on %s",
 		       __func__, tmp->rtpref, intface);
 		exit(1);
+	}
 	MAYHAVE(val, "rltime", tmp->maxinterval * 3);
 	if (val && (val < tmp->maxinterval || val > MAXROUTERLIFETIME)) {
 		syslog(LOG_ERR,
-		       "<%s> router lifetime (%ld) on %s is invalid "
+		       "<%s> router lifetime (%d) on %s is invalid "
 		       "(must be 0 or between %d and %d)",
 		       __func__, val, intface,
 		       tmp->maxinterval, MAXROUTERLIFETIME);
 		exit(1);
+	}
 	/*
 	 * Basically, hosts MUST NOT send Router Advertisement messages at any
 	 * time (RFC 2461, Section 6.2.3). However, it would sometimes be
 	 * useful to allow hosts to advertise some parameters such as prefix
 	 * information and link MTU. Thus, we allow hosts to invoke rtadvd
 	 * only when router lifetime (on every advertising interface) is
 	 * explicitly set zero. (see also the above section)
 	 */
 	if (val && forwarding == 0) {
 		syslog(LOG_ERR,
 		       "<%s> non zero router lifetime is specified for %s, "
 		       "which must not be allowed for hosts.  you must "
 		       "change router lifetime or enable IPv6 forwarding.",
 		       __func__, intface);
 		exit(1);
+	}
 	tmp->lifetime = val & 0xffff;
 	MAYHAVE(val, "rtime", DEF_ADVREACHABLETIME);
 	if (val < 0 || val > MAXREACHABLETIME) {
 		syslog(LOG_ERR,
-		       "<%s> reachable time (%ld) on %s is invalid "
+		       "<%s> reachable time (%d) on %s is invalid "
 		       "(must be no greater than %d)",
 		       __func__, val, intface, MAXREACHABLETIME);
 		exit(1);
+	}
-	tmp->reachabletime = (u_int32_t)val;
+	tmp->reachabletime = (uint32_t)val;
 	MAYHAVE(val64, "retrans", DEF_ADVRETRANSTIMER);
 	if (val64 < 0 || val64 > 0xffffffff) {
 		syslog(LOG_ERR, "<%s> retrans time (%lld) on %s out of range",
 		       __func__, (long long)val64, intface);
 		exit(1);
+	}
-	tmp->retranstimer = (u_int32_t)val64;
+	tmp->retranstimer = (uint32_t)val64;
 	if (agetnum("hapref") != -1 || agetnum("hatime") != -1) {
 		syslog(LOG_ERR,
 		       "<%s> mobile-ip6 configuration not supported",
 		       __func__);
 		exit(1);
+	}
 	/* prefix information */
 	/*
 	 * This is an implementation specific parameter to consider
 	 * link propagation delays and poorly synchronized clocks when
 	 * checking consistency of advertised lifetimes.
 	 */
 	MAYHAVE(val, "clockskew", 0);
 	tmp->clockskew = val;
-	tmp->pfxs = 0;
+	tmp->pfxs++;
 	TAILQ_INIT(&tmp->prefix);
 	for (i = -1; i < MAXPREFIX; i++) {
 		struct prefix *pfx;
 		char entbuf[256];
 		makeentry(entbuf, sizeof(entbuf), i, "addr");
 		addr = (char *)agetstr(entbuf, &bp);
 		if (addr == NULL)
 			continue;
 		/* allocate memory to store prefix information */
 		if ((pfx = malloc(sizeof(struct prefix))) == NULL) {
 			syslog(LOG_ERR,
 			       "<%s> can't allocate enough memory",
 			       __func__);
 			exit(1);
+		}
 		memset(pfx, 0, sizeof(*pfx));
-		/* link into chain */
+		TAILQ_INSERT_TAIL(&tmp->prefix, pfx, next);
 		insque(pfx, &tmp->prefix);
 		pfx->rainfo = tmp;
 		tmp->pfxs++;
 		pfx->rainfo = tmp;
 		pfx->origin = PREFIX_FROM_CONFIG;
 		if (inet_pton(AF_INET6, addr, &pfx->prefix) != 1) {
 			syslog(LOG_ERR,
 			       "<%s> inet_pton failed for %s",
 			       __func__, addr);
 			exit(1);
+		}
 		if (IN6_IS_ADDR_MULTICAST(&pfx->prefix)) {
 			syslog(LOG_ERR,
 			       "<%s> multicast prefix (%s) must "
 			       "not be advertised on %s",
 			       __func__, addr, intface);
 			exit(1);
+		}
 		if (IN6_IS_ADDR_LINKLOCAL(&pfx->prefix))
 			syslog(LOG_NOTICE,
 			       "<%s> link-local prefix (%s) will be"
 			       " advertised on %s",
 			       __func__, addr, intface);
 		makeentry(entbuf, sizeof(entbuf), i, "prefixlen");
 		MAYHAVE(val, entbuf, 64);
 		if (val < 0 || val > 128) {
-			syslog(LOG_ERR, "<%s> prefixlen (%ld) for %s "
+			syslog(LOG_ERR, "<%s> prefixlen (%d) for %s "
 			       "on %s out of range",
 			       __func__, val, addr, intface);
 			exit(1);
+		}
 		pfx->prefixlen = (int)val;
 		makeentry(entbuf, sizeof(entbuf), i, "pinfoflags");
 		if ((flagstr = (char *)agetstr(entbuf, &bp))) {
 			val = 0;
 			if (strchr(flagstr, 'l'))
 				val |= ND_OPT_PI_FLAG_ONLINK;
 			if (strchr(flagstr, 'a'))
 				val |= ND_OPT_PI_FLAG_AUTO;
 @@ -339,144 +360,136 @@ getconfig(intface)
+		}
 		pfx->onlinkflg = val & ND_OPT_PI_FLAG_ONLINK;
 		pfx->autoconfflg = val & ND_OPT_PI_FLAG_AUTO;
 		makeentry(entbuf, sizeof(entbuf), i, "vltime");
 		MAYHAVE(val64, entbuf, DEF_ADVVALIDLIFETIME);
 		if (val64 < 0 || val64 > 0xffffffff) {
 			syslog(LOG_ERR, "<%s> vltime (%lld) for "
 			    "%s/%d on %s is out of range",
 			    __func__, (long long)val64,
 			    addr, pfx->prefixlen, intface);
 			exit(1);
+		}
-		pfx->validlifetime = (u_int32_t)val64;
+		pfx->validlifetime = (uint32_t)val64;
 		makeentry(entbuf, sizeof(entbuf), i, "vltimedecr");
 		if (agetflag(entbuf)) {
 			struct timeval now;
 			gettimeofday(&now, 0);
 			pfx->vltimeexpire =
 				now.tv_sec + pfx->validlifetime;
+		}
 		makeentry(entbuf, sizeof(entbuf), i, "pltime");
 		MAYHAVE(val64, entbuf, DEF_ADVPREFERREDLIFETIME);
 		if (val64 < 0 || val64 > 0xffffffff) {
 			syslog(LOG_ERR,
 			    "<%s> pltime (%lld) for %s/%d on %s "
 			    "is out of range",
 			    __func__, (long long)val64,
 			    addr, pfx->prefixlen, intface);
 			exit(1);
+		}
-		pfx->preflifetime = (u_int32_t)val64;
+		pfx->preflifetime = (uint32_t)val64;
 		makeentry(entbuf, sizeof(entbuf), i, "pltimedecr");
 		if (agetflag(entbuf)) {
 			struct timeval now;
 			gettimeofday(&now, 0);
 			pfx->pltimeexpire =
 				now.tv_sec + pfx->preflifetime;
+		}
+	}
-	if (tmp->pfxs == 0)
+	if (TAILQ_FIRST(&tmp->prefix) == NULL)
 		get_prefix(tmp);
-	MAYHAVE(val, "mtu", 0);
+	MAYHAVE(val64, "mtu", 0);
-	if (val < 0 || val > 0xffffffff) {
+	if (val64 < 0 || val64 > 0xffffffff) {
 		syslog(LOG_ERR,
-		       "<%s> mtu (%ld) on %s out of range",
+		       "<%s> mtu (%" PRIi64 ") on %s out of range",
-		       __func__, val, intface);
+		       __func__, val64, intface);
 		exit(1);
+	}
-	tmp->linkmtu = (u_int32_t)val;
+	tmp->linkmtu = (uint32_t)val64;
 	if (tmp->linkmtu == 0) {
 		char *mtustr;
 		if ((mtustr = (char *)agetstr("mtu", &bp)) &&
 		    strcmp(mtustr, "auto") == 0)
 			tmp->linkmtu = tmp->phymtu;
+	}
 	else if (tmp->linkmtu < IPV6_MMTU || tmp->linkmtu > tmp->phymtu) {
 		syslog(LOG_ERR,
-		       "<%s> advertised link mtu (%lu) on %s is invalid (must "
+		       "<%s> advertised link mtu (%d) on %s is invalid (must "
 		       "be between least MTU (%d) and physical link MTU (%d)",
-		       __func__, (unsigned long)tmp->linkmtu, intface,
+		       __func__, tmp->linkmtu, intface,
 		       IPV6_MMTU, tmp->phymtu);
 		exit(1);
+	}
 #ifdef SIOCSIFINFO_IN6
+	{
 		struct in6_ndireq ndi;
 		int s;
 		if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
 			syslog(LOG_ERR, "<%s> socket: %s", __func__,
 			       strerror(errno));
 			exit(1);
+		}
 		memset(&ndi, 0, sizeof(ndi));
 		strncpy(ndi.ifname, intface, IFNAMSIZ);
-		if (ioctl(s, SIOCGIFINFO_IN6, (caddr_t)&ndi) < 0) {
+		if (ioctl(s, SIOCGIFINFO_IN6, &ndi) < 0) {
 			syslog(LOG_INFO, "<%s> ioctl:SIOCGIFINFO_IN6 at %s: %s",
 			     __func__, intface, strerror(errno));
+		}
 		/* reflect the RA info to the host variables in kernel */
 		ndi.ndi.chlim = tmp->hoplimit;
 		ndi.ndi.retrans = tmp->retranstimer;
 		ndi.ndi.basereachable = tmp->reachabletime;
-		if (ioctl(s, SIOCSIFINFO_IN6, (caddr_t)&ndi) < 0) {
+		if (ioctl(s, SIOCSIFINFO_IN6, &ndi) < 0) {
 			syslog(LOG_INFO, "<%s> ioctl:SIOCSIFINFO_IN6 at %s: %s",
 			     __func__, intface, strerror(errno));
+		}
 		close(s);
+	}
 #endif
 	/* route information */
-#ifdef ROUTEINFO
+	TAILQ_INIT(&tmp->route);
 	tmp->routes = 0;
 	for (i = -1; i < MAXROUTE; i++) {
 		struct rtinfo *rti;
-		char entbuf[256], oentbuf[256];
+		char oentbuf[256];
 		makeentry(entbuf, sizeof(entbuf), i, "rtprefix");
 		addr = (char *)agetstr(entbuf, &bp);
 		if (addr == NULL) {
 			makeentry(oentbuf, sizeof(oentbuf), i, "rtrprefix");
 			addr = (char *)agetstr(oentbuf, &bp);
 			if (addr) {
 				fprintf(stderr, "%s was obsoleted.  Use %s.\n",
 					oentbuf, entbuf);
+			}
+		}
 		if (addr == NULL)
 			continue;
-		/* allocate memory to store prefix information */
+		ELM_MALLOC(rti, exit(1));
 		if ((rti = malloc(sizeof(struct rtinfo))) == NULL) {
 			syslog(LOG_ERR,
 			       "<%s> can't allocate enough memory",
 			       __func__);
 			exit(1);
 		memset(rti, 0, sizeof(*rti));
 		/* link into chain */
-		insque(rti, &tmp->route);
+		TAILQ_INSERT_TAIL(&tmp->route, rti, next);
 		tmp->routes++;
 		if (inet_pton(AF_INET6, addr, &rti->prefix) != 1) {
 			syslog(LOG_ERR, "<%s> inet_pton failed for %s",
 			       __func__, addr);
 			exit(1);
+		}
 #if 0
 		/*
 		 * XXX: currently there's no restriction in route information
 		 * prefix according to
 		 * draft-ietf-ipngwg-router-selection-00.txt.
 		 * However, I think the similar restriction be necessary.
 		 */
 @@ -500,27 +513,27 @@ getconfig(intface)
 		makeentry(entbuf, sizeof(entbuf), i, "rtplen");
 		/* XXX: 256 is a magic number for compatibility check. */
 		MAYHAVE(val, entbuf, 256);
 		if (val == 256) {
 			makeentry(oentbuf, sizeof(oentbuf), i, "rtrplen");
 			MAYHAVE(val, oentbuf, 256);
 			if (val != 256) {
 				fprintf(stderr, "%s was obsoleted.  Use %s.\n",
 					oentbuf, entbuf);
 			} else
 				val = 64;
+		}
 		if (val < 0 || val > 128) {
-			syslog(LOG_ERR, "<%s> prefixlen (%ld) for %s on %s "
+			syslog(LOG_ERR, "<%s> prefixlen (%d) for %s on %s "
 			       "out of range",
 			       __func__, val, addr, intface);
 			exit(1);
+		}
 		rti->prefixlen = (int)val;
 		makeentry(entbuf, sizeof(entbuf), i, "rtflags");
 		if ((flagstr = (char *)agetstr(entbuf, &bp))) {
 			val = 0;
 			if (strchr(flagstr, 'h'))
 				val |= ND_RA_FLAG_RTPREF_HIGH;
 			if (strchr(flagstr, 'l')) {
 				if ((val & ND_RA_FLAG_RTPREF_HIGH)) {
 @@ -569,73 +582,149 @@ getconfig(intface)
 			} else {
 				fprintf(stderr, "%s should be specified "
 					"for interface %s.\n",
 					entbuf, intface);
 				val64 = tmp->lifetime;
+			}
+		}
 		if (val64 < 0 || val64 > 0xffffffff) {
 			syslog(LOG_ERR, "<%s> route lifetime (%lld) for "
 			    "%s/%d on %s out of range", __func__,
 			    (long long)val64, addr, rti->prefixlen, intface);
 			exit(1);
+		}
-		rti->ltime = (u_int32_t)val64;
+		rti->ltime = (uint32_t)val64;
+	}
 	/* RDNSS */
 	TAILQ_INIT(&tmp->rdnss);
 	for (i = -1; i < MAXRDNSS; i++) {
 		struct rdnss *rdnss;
 		struct rdnss_addr *rdnsa;
 		makeentry(entbuf, sizeof(entbuf), i, "rdnss");
 		addr = (char *)agetstr(entbuf, &bp);
 		if (addr == NULL)
 			continue;
 		ELM_MALLOC(rdnss, exit(1));
 		TAILQ_INIT(&rdnss->list);
 		for (ap = addr; ap - addr < (ssize_t)strlen(addr); ap += c+1) {
 			c = strcspn(ap, ",");
 			strncpy(abuf, ap, c);
 			abuf[c] = '\0';
 			ELM_MALLOC(rdnsa, exit(1));
 			if (inet_pton(AF_INET6, abuf, &rdnsa->addr) != 1) {
 				syslog(LOG_ERR, "<%s> inet_pton failed for %s",
 			           __func__, addr);
 				exit(1);
+			}
 			TAILQ_INSERT_TAIL(&rdnss->list, rdnsa, next);
+		}
 		makeentry(entbuf, sizeof(entbuf), i, "rdnssltime");
 		MAYHAVE(val64, entbuf, tmp->maxinterval * 3 / 2);
 		if (val64 < tmp->maxinterval ||
 		    val64 > tmp->maxinterval * 2)
+		{
 			syslog(LOG_ERR, "<%s> %s (%lld) on %s is invalid",
 		    	     __func__, entbuf, (long long)val64, intface);
 			exit(1);
+		}
 		rdnss->lifetime = (uint32_t)val64;
 		TAILQ_INSERT_TAIL(&tmp->rdnss, rdnss, next);
+	}
 	/* DNSSL */
 	TAILQ_INIT(&tmp->dnssl);
 	for (i = -1; i < MAXDNSSL; i++) {
 		struct dnssl *dnssl;
 		struct dnssl_domain *dnsd;
 		makeentry(entbuf, sizeof(entbuf), i, "dnssl");
 		addr = (char *)agetstr(entbuf, &bp);
 		if (addr == NULL)
 			continue;
 		ELM_MALLOC(dnssl, exit(1));
 		TAILQ_INIT(&dnssl->list);
 		for (ap = addr; ap - addr < (ssize_t)strlen(addr); ap += c+1) {
 			c = strcspn(ap, ",");
 			strncpy(abuf, ap, c);
 			abuf[c] = '\0';
 			ELM_MALLOC(dnsd, exit(1));
 			dnsd->len = encode_domain(dnsd->domain, abuf);
 			TAILQ_INSERT_TAIL(&dnssl->list, dnsd, next);
+		}
 		makeentry(entbuf, sizeof(entbuf), i, "dnsslltime");
 		MAYHAVE(val64, entbuf, tmp->maxinterval * 3 / 2);
 		if (val64 < tmp->maxinterval ||
 		    val64 > tmp->maxinterval * 2)
+		{
 			syslog(LOG_ERR, "<%s> %s (%lld) on %s is invalid",
 		    	     __func__, entbuf, (long long)val64, intface);
 			exit(1);
+		}
 		dnssl->lifetime = (uint32_t)val64;
 		TAILQ_INSERT_TAIL(&tmp->dnssl, dnssl, next);
+	}
 #endif
 	/* okey */
-	tmp->next = ralist;
+	TAILQ_INSERT_TAIL(&ralist, tmp, next);
 	ralist = tmp;
 	/* construct the sending packet */
 	make_packet(tmp);
 	/* set timer */
 	tmp->timer = rtadvd_add_timer(ra_timeout, ra_timer_update,
 				      tmp, tmp);
 	ra_timer_update((void *)tmp, &tmp->timer->tm);
 	rtadvd_set_timer(&tmp->timer->tm, tmp->timer);
+}
 void
 get_prefix(struct rainfo *rai)
+{
 	struct ifaddrs *ifap, *ifa;
 	struct prefix *pp;
 	struct in6_addr *a;
-	u_char *p, *ep, *m, *lim;
+	unsigned char *p, *ep, *m, *lim;
 	char ntopbuf[INET6_ADDRSTRLEN];
 	if (getifaddrs(&ifap) < 0) {
 		syslog(LOG_ERR,
 		       "<%s> can't get interface addresses",
 		       __func__);
 		exit(1);
+	}
 	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
 		int plen;
 		if (strcmp(ifa->ifa_name, rai->ifname) != 0)
 			continue;
 		if (ifa->ifa_addr->sa_family != AF_INET6)
 			continue;
 		a = &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr;
 		if (IN6_IS_ADDR_LINKLOCAL(a))
 			continue;
 		/* get prefix length */
-		m = (u_char *)&((struct sockaddr_in6 *)ifa->ifa_netmask)->sin6_addr;
+		m = (unsigned char *)&((struct sockaddr_in6 *)ifa->ifa_netmask)->sin6_addr;
-		lim = (u_char *)(ifa->ifa_netmask) + ifa->ifa_netmask->sa_len;
+		lim = (unsigned char *)(ifa->ifa_netmask) + ifa->ifa_netmask->sa_len;
 		plen = prefixlen(m, lim);
 		if (plen <= 0 || plen > 128) {
 			syslog(LOG_ERR, "<%s> failed to get prefixlen "
 			       "or prefix is invalid",
 			       __func__);
 			exit(1);
+		}
 		if (plen == 128)	/* XXX */
 			continue;
 		if (find_prefix(rai, a, plen)) {
 			/* ignore a duplicated prefix. */
 			continue;
+		}
 @@ -644,66 +733,59 @@ get_prefix(struct rainfo *rai)
 		if ((pp = malloc(sizeof(*pp))) == NULL) {
 			syslog(LOG_ERR,
 			       "<%s> can't get allocate buffer for prefix",
 			       __func__);
 			exit(1);
+		}
 		memset(pp, 0, sizeof(*pp));
 		/* set prefix, sweep bits outside of prefixlen */
 		pp->prefixlen = plen;
 		memcpy(&pp->prefix, a, sizeof(*a));
 		if (1)
+		{
-			p = (u_char *)&pp->prefix;
+			p = (unsigned char *)&pp->prefix;
-			ep = (u_char *)(&pp->prefix + 1);
+			ep = (unsigned char *)(&pp->prefix + 1);
 			while (m < lim && p < ep)
 				*p++ &= *m++;
 			while (p < ep)
 				*p++ = 0x00;
+		}
 	        if (!inet_ntop(AF_INET6, &pp->prefix, ntopbuf,
 	            sizeof(ntopbuf))) {
 			syslog(LOG_ERR, "<%s> inet_ntop failed", __func__);
 			exit(1);
+		}
 		syslog(LOG_DEBUG,
 		       "<%s> add %s/%d to prefix list on %s",
 		       __func__, ntopbuf, pp->prefixlen, rai->ifname);
 		/* set other fields with protocol defaults */
 		pp->validlifetime = DEF_ADVVALIDLIFETIME;
 		pp->preflifetime = DEF_ADVPREFERREDLIFETIME;
 		pp->onlinkflg = 1;
 		pp->autoconfflg = 1;
 		pp->origin = PREFIX_FROM_KERNEL;
 		pp->rainfo = rai;
 		/* link into chain */
-		insque(pp, &rai->prefix);
+		TAILQ_INSERT_TAIL(&rai->prefix, pp, next);
 		/* counter increment */
 		rai->pfxs++;
+	}
 	freeifaddrs(ifap);
+}
 static void
-makeentry(buf, len, id, string)
+makeentry(char *buf, size_t len, int id, const char *string)
 	char *buf;
 	size_t len;
 	int id;
 	char *string;
+{
 	if (id < 0)
 		strlcpy(buf, string, len);
 	else
 		snprintf(buf, len, "%s%d", string, id);
+}
 /*
  * Add a prefix to the list of specified interface and reconstruct
  * the outgoing packet.
  * The prefix must not be in the list.
  * XXX: other parameters of the prefix(e.g. lifetime) should be
 @@ -719,63 +801,63 @@ add_prefix(struct rainfo *rai, struct in
 		syslog(LOG_ERR, "<%s> memory allocation failed",
 		       __func__);
 		return;		/* XXX: error or exit? */
+	}
 	memset(prefix, 0, sizeof(*prefix));
 	prefix->prefix = ipr->ipr_prefix.sin6_addr;
 	prefix->prefixlen = ipr->ipr_plen;
 	prefix->validlifetime = ipr->ipr_vltime;
 	prefix->preflifetime = ipr->ipr_pltime;
 	prefix->onlinkflg = ipr->ipr_raf_onlink;
 	prefix->autoconfflg = ipr->ipr_raf_auto;
 	prefix->origin = PREFIX_FROM_DYNAMIC;
 	insque(prefix, &rai->prefix);
 	prefix->rainfo = rai;
 	TAILQ_INSERT_TAIL(&rai->prefix, prefix, next);
 	rai->pfxs++;
 	syslog(LOG_DEBUG, "<%s> new prefix %s/%d was added on %s",
 	       __func__, inet_ntop(AF_INET6, &ipr->ipr_prefix.sin6_addr,
 				       ntopbuf, INET6_ADDRSTRLEN),
 	       ipr->ipr_plen, rai->ifname);
 	/* free the previous packet */
 	free(rai->ra_data);
 	rai->ra_data = NULL;
 	/* reconstruct the packet */
 	rai->pfxs++;
 	make_packet(rai);
+}
 /*
  * Delete a prefix to the list of specified interface and reconstruct
  * the outgoing packet.
  * The prefix must be in the list.
  */
 void
 delete_prefix(struct prefix *prefix)
+{
 	char ntopbuf[INET6_ADDRSTRLEN];
 	struct rainfo *rai = prefix->rainfo;
-	remque(prefix);
+	TAILQ_REMOVE(&rai->prefix, prefix, next);
 	rai->pfxs--;
 	syslog(LOG_DEBUG, "<%s> prefix %s/%d was deleted on %s",
 	       __func__, inet_ntop(AF_INET6, &prefix->prefix,
 				       ntopbuf, INET6_ADDRSTRLEN),
 	       prefix->prefixlen, rai->ifname);
 	if (prefix->timer)
 		rtadvd_remove_timer(&prefix->timer);
 	free(prefix);
 	rai->pfxs--;
+}
 void
 invalidate_prefix(struct prefix *prefix)
+{
 	char ntopbuf[INET6_ADDRSTRLEN];
 	struct timeval timo;
 	struct rainfo *rai = prefix->rainfo;
 	if (prefix->timer) {	/* sanity check */
 		syslog(LOG_ERR,
 		    "<%s> assumption failure: timer already exists",
 		    __func__);
 @@ -837,27 +919,27 @@ update_prefix(struct prefix * prefix)
  */
 static int
 init_prefix(struct in6_prefixreq *ipr)
+{
 #if 0
 	int s;
 	if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
 		syslog(LOG_ERR, "<%s> socket: %s", __func__,
 		       strerror(errno));
 		exit(1);
+	}
-	if (ioctl(s, SIOCGIFPREFIX_IN6, (caddr_t)ipr) < 0) {
+	if (ioctl(s, SIOCGIFPREFIX_IN6, ipr) < 0) {
 		syslog(LOG_INFO, "<%s> ioctl:SIOCGIFPREFIX %s", __func__,
 		       strerror(errno));
 		ipr->ipr_vltime = DEF_ADVVALIDLIFETIME;
 		ipr->ipr_pltime = DEF_ADVPREFERREDLIFETIME;
 		ipr->ipr_raf_onlink = 1;
 		ipr->ipr_raf_auto = 1;
 		/* omit other field initialization */
+	}
 	else if (ipr->ipr_origin < PR_ORIG_RR) {
 		char ntopbuf[INET6_ADDRSTRLEN];
 		syslog(LOG_WARNING, "<%s> Added prefix(%s)'s origin %d is"
 @@ -896,82 +978,99 @@ make_prefix(struct rainfo *rai, int ifin
 	ipr.ipr_prefix.sin6_family = AF_INET6;
 	ipr.ipr_prefix.sin6_addr = *addr;
 	ipr.ipr_plen = plen;
 	if (init_prefix(&ipr))
 		return; /* init failed by some error */
 	add_prefix(rai, &ipr);
+}
 void
 make_packet(struct rainfo *rainfo)
+{
 	size_t packlen, lladdroptlen = 0;
-	u_char *buf;
+	char *buf;
 	struct nd_router_advert *ra;
 	struct nd_opt_prefix_info *ndopt_pi;
 	struct nd_opt_mtu *ndopt_mtu;
 	struct prefix *pfx;
 #ifdef ROUTEINFO
 	struct nd_opt_route_info *ndopt_rti;
 	struct rtinfo *rti;
-#endif
+	struct nd_opt_rdnss *ndopt_rdnss;
 	struct rdnss *rdns;
 	struct rdnss_addr *rdnsa;
 	struct nd_opt_dnssl *ndopt_dnssl;
 	struct dnssl *dnsl;
 	struct dnssl_domain *dnsd;
 	size_t len, plen;
 	/* calculate total length */
 	packlen = sizeof(struct nd_router_advert);
 	if (rainfo->advlinkopt) {
 		if ((lladdroptlen = lladdropt_length(rainfo->sdl)) == 0) {
 			syslog(LOG_INFO,
 			       "<%s> link-layer address option has"
 			       " null length on %s.  Treat as not included.",
 			       __func__, rainfo->ifname);
 			rainfo->advlinkopt = 0;
+		}
 		packlen += lladdroptlen;
+	}
-	if (rainfo->pfxs)
+	if (TAILQ_FIRST(&rainfo->prefix) != NULL)
 		packlen += sizeof(struct nd_opt_prefix_info) * rainfo->pfxs;
 	if (rainfo->linkmtu)
 		packlen += sizeof(struct nd_opt_mtu);
-#ifdef ROUTEINFO
+	TAILQ_FOREACH(rti, &rainfo->route, next)
 	for (rti = rainfo->route.next; rti != &rainfo->route; rti = rti->next)
 		packlen += sizeof(struct nd_opt_route_info) +
 			   ((rti->prefixlen + 0x3f) >> 6) * 8;
 #endif
 	TAILQ_FOREACH(rdns, &rainfo->rdnss, next) {
 		packlen += sizeof(struct nd_opt_rdnss);
 		TAILQ_FOREACH(rdnsa, &rdns->list, next)
 			packlen += sizeof(rdnsa->addr);
+	}
 	TAILQ_FOREACH(dnsl, &rainfo->dnssl, next) {
 		packlen += sizeof(struct nd_opt_dnssl);
 		len = 0;
 		TAILQ_FOREACH(dnsd, &dnsl->list, next)
 			len += dnsd->len;
 		len += len % 8 ? 8 - len % 8 : 0;
 		packlen += len;
+	}
 	/* allocate memory for the packet */
 	if ((buf = malloc(packlen)) == NULL) {
 		syslog(LOG_ERR,
 		       "<%s> can't get enough memory for an RA packet",
 		       __func__);
 		exit(1);
+	}
 	if (rainfo->ra_data) {
 		/* free the previous packet */
 		free(rainfo->ra_data);
 		rainfo->ra_data = NULL;
+	}
 	rainfo->ra_data = buf;
 	/* XXX: what if packlen > 576? */
 	rainfo->ra_datalen = packlen;
 	/*
 	 * construct the packet
 	 */
 	ra = (struct nd_router_advert *)buf;
 	ra->nd_ra_type = ND_ROUTER_ADVERT;
 	ra->nd_ra_code = 0;
 	ra->nd_ra_cksum = 0;
-	ra->nd_ra_curhoplimit = (u_int8_t)(0xff & rainfo->hoplimit);
+	ra->nd_ra_curhoplimit = (uint8_t)(0xff & rainfo->hoplimit);
 	ra->nd_ra_flags_reserved = 0; /* just in case */
 	/*
 	 * XXX: the router preference field, which is a 2-bit field, should be
 	 * initialized before other fields.
 	 */
 	ra->nd_ra_flags_reserved = 0xff & rainfo->rtpref;
 	ra->nd_ra_flags_reserved |=
 		rainfo->managedflg ? ND_RA_FLAG_MANAGED : 0;
 	ra->nd_ra_flags_reserved |=
 		rainfo->otherflg ? ND_RA_FLAG_OTHER : 0;
 	ra->nd_ra_router_lifetime = htons(rainfo->lifetime);
 	ra->nd_ra_reachable = htonl(rainfo->reachabletime);
 	ra->nd_ra_retransmit = htonl(rainfo->retranstimer);
 @@ -981,31 +1080,28 @@ make_packet(struct rainfo *rainfo)
 		lladdropt_fill(rainfo->sdl, (struct nd_opt_hdr *)buf);
 		buf += lladdroptlen;
+	}
 	if (rainfo->linkmtu) {
 		ndopt_mtu = (struct nd_opt_mtu *)buf;
 		ndopt_mtu->nd_opt_mtu_type = ND_OPT_MTU;
 		ndopt_mtu->nd_opt_mtu_len = 1;
 		ndopt_mtu->nd_opt_mtu_reserved = 0;
 		ndopt_mtu->nd_opt_mtu_mtu = htonl(rainfo->linkmtu);
 		buf += sizeof(struct nd_opt_mtu);
+	}
 	TAILQ_FOREACH(pfx, &rainfo->prefix, next) {
 		uint32_t vltime, pltime;
 	for (pfx = rainfo->prefix.next;
 	     pfx != &rainfo->prefix; pfx = pfx->next) {
 		u_int32_t vltime, pltime;
 		struct timeval now;
 		ndopt_pi = (struct nd_opt_prefix_info *)buf;
 		ndopt_pi->nd_opt_pi_type = ND_OPT_PREFIX_INFORMATION;
 		ndopt_pi->nd_opt_pi_len = 4;
 		ndopt_pi->nd_opt_pi_prefix_len = pfx->prefixlen;
 		ndopt_pi->nd_opt_pi_flags_reserved = 0;
 		if (pfx->onlinkflg)
 			ndopt_pi->nd_opt_pi_flags_reserved |=
 				ND_OPT_PI_FLAG_ONLINK;
 		if (pfx->autoconfflg)
 			ndopt_pi->nd_opt_pi_flags_reserved |=
 				ND_OPT_PI_FLAG_AUTO;
 @@ -1034,42 +1130,73 @@ make_packet(struct rainfo *rainfo)
 			 * this can happen if vltime is decrement but pltime
 			 * is not.
 			 */
 			pltime = vltime;
+		}
 		ndopt_pi->nd_opt_pi_valid_time = htonl(vltime);
 		ndopt_pi->nd_opt_pi_preferred_time = htonl(pltime);
 		ndopt_pi->nd_opt_pi_reserved2 = 0;
 		ndopt_pi->nd_opt_pi_prefix = pfx->prefix;
 		buf += sizeof(struct nd_opt_prefix_info);
+	}
-#ifdef ROUTEINFO
+	TAILQ_FOREACH(rti, &rainfo->route, next) {
-	for (rti = rainfo->route.next; rti != &rainfo->route; rti = rti->next) {
+		uint8_t psize = (rti->prefixlen + 0x3f) >> 6;
 		u_int8_t psize = (rti->prefixlen + 0x3f) >> 6;
 		ndopt_rti = (struct nd_opt_route_info *)buf;
 		ndopt_rti->nd_opt_rti_type = ND_OPT_ROUTE_INFO;
 		ndopt_rti->nd_opt_rti_len = 1 + psize;
 		ndopt_rti->nd_opt_rti_prefixlen = rti->prefixlen;
 		ndopt_rti->nd_opt_rti_flags = 0xff & rti->rtpref;
 		ndopt_rti->nd_opt_rti_lifetime = htonl(rti->ltime);
 		memcpy(ndopt_rti + 1, &rti->prefix, psize * 8);
 		buf += sizeof(struct nd_opt_route_info) + psize * 8;
+	}
 #endif
-	return;
+	TAILQ_FOREACH(rdns, &rainfo->rdnss, next) {
 		ndopt_rdnss = (struct nd_opt_rdnss *)buf;
 		ndopt_rdnss->nd_opt_rdnss_type = ND_OPT_RDNSS;
 		ndopt_rdnss->nd_opt_rdnss_len = 1;
 		ndopt_rdnss->nd_opt_rdnss_reserved = 0;
 		ndopt_rdnss->nd_opt_rdnss_lifetime = htonl(rdns->lifetime);
 		buf += sizeof(*ndopt_rdnss);
 		TAILQ_FOREACH(rdnsa, &rdns->list, next) {
 			memcpy(buf, &rdnsa->addr, sizeof(rdnsa->addr));
 			ndopt_rdnss->nd_opt_rdnss_len += 2;
 			buf += sizeof(rdnsa->addr);
+		}
+	}
 	TAILQ_FOREACH(dnsl, &rainfo->dnssl, next) {
 		ndopt_dnssl = (struct nd_opt_dnssl *)buf;
 		ndopt_dnssl->nd_opt_dnssl_type = ND_OPT_DNSSL;
 		ndopt_dnssl->nd_opt_dnssl_len = 0;
 		ndopt_dnssl->nd_opt_dnssl_reserved = 0;
 		ndopt_dnssl->nd_opt_dnssl_lifetime = htonl(dnsl->lifetime);
 		buf += sizeof(*ndopt_dnssl);
 		TAILQ_FOREACH(dnsd, &dnsl->list, next) {
 			memcpy(buf, dnsd->domain, dnsd->len);
 			buf += dnsd->len;
+		}
 		/* Ensure our length is padded correctly */
 		len = buf - (char *)ndopt_dnssl;
 		plen = len % 8 ? 8 - len % 8 : 0;
 		memset(buf, 0, plen);
 		buf += plen;
 		ndopt_dnssl->nd_opt_dnssl_len = (len + plen) / 8;
+	}
+}
 static int
 getinet6sysctl(int code)
+{
 	int mib[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, 0 };
 	int value;
 	size_t size;
 	mib[3] = code;
 	size = sizeof(value);
 	if (sysctl(mib, sizeof(mib)/sizeof(mib[0]), &value, &size, NULL, 0)
 	    < 0) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dump.c,v 1.8 2008/12/29 04:01:21 christos Exp $	*/
+/*	$NetBSD: dump.c,v 1.9 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: dump.c,v 1.34 2004/06/14 05:35:59 itojun Exp $	*/
 /*
  * Copyright (C) 2000 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -49,68 +49,67 @@
 #include <stdarg.h>
 #include <syslog.h>
 #include <string.h>
 #include <errno.h>
 #include <netdb.h>
 #include "rtadvd.h"
 #include "timer.h"
 #include "if.h"
 #include "dump.h"
 static FILE *fp;
-extern struct rainfo *ralist;
+static char *ether_str(struct sockaddr_dl *);
 static void if_dump(void);
-static char *ether_str __P((struct sockaddr_dl *));
+static const char *rtpref_str[] = {
 static void if_dump __P((void));
 static char *rtpref_str[] = {
 	"medium",		/* 00 */
 	"high",			/* 01 */
 	"rsv",			/* 10 */
 	"low"			/* 11 */
 };
 static char *
-ether_str(sdl)
+ether_str(struct sockaddr_dl *sdl)
 	struct sockaddr_dl *sdl;
+{
 	static char hbuf[NI_MAXHOST];
 	if (sdl->sdl_alen) {
 		if (getnameinfo((struct sockaddr *)sdl, sdl->sdl_len,
 		    hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
 			snprintf(hbuf, sizeof(hbuf), "<invalid>");
 	} else
 		snprintf(hbuf, sizeof(hbuf), "NONE");
 	return(hbuf);
+}
 static void
-if_dump()
+if_dump(void)
+{
 	struct rainfo *rai;
 	struct prefix *pfx;
 #ifdef ROUTEINFO
 	struct rtinfo *rti;
-#endif
+	struct rdnss *rdns;
 	struct rdnss_addr *rdnsa;
 	struct dnssl *dnsl;
 	struct dnssl_domain *dnsd;
 	char *p, len;
 	char prefixbuf[INET6_ADDRSTRLEN];
 	int first;
 	struct timeval now;
 	gettimeofday(&now, NULL); /* XXX: unused in most cases */
-	for (rai = ralist; rai; rai = rai->next) {
+	TAILQ_FOREACH(rai, &ralist, next) {
 		fprintf(fp, "%s:\n", rai->ifname);
 		fprintf(fp, "  Status: %s\n",
 			(iflist[rai->ifindex]->ifm_flags & IFF_UP) ? "UP" :
 			"DOWN");
 		/* control information */
 		if (rai->lastsent.tv_sec) {
 			/* note that ctime() appends CR by itself */
 			fprintf(fp, "  Last RA sent: %s",
 				ctime((time_t *)&rai->lastsent.tv_sec));
+		}
 		if (rai->timer) {
 @@ -141,34 +140,31 @@ if_dump()
 		fprintf(fp, "  DefaultLifetime: %d, MaxAdvInterval: %d, "
 		    "MinAdvInterval: %d\n", rai->lifetime, rai->maxinterval,
 		    rai->mininterval);
 		fprintf(fp, "  Flags: %s%s%s, ",
 		    rai->managedflg ? "M" : "", rai->otherflg ? "O" : "",
 		    "");
 		fprintf(fp, "Preference: %s, ",
 			rtpref_str[(rai->rtpref >> 3) & 0xff]);
 		fprintf(fp, "MTU: %d\n", rai->linkmtu);
 		fprintf(fp, "  ReachableTime: %d, RetransTimer: %d, "
 			"CurHopLimit: %d\n", rai->reachabletime,
 			rai->retranstimer, rai->hoplimit);
 		if (rai->clockskew)
-			fprintf(fp, "  Clock skew: %ldsec\n",
+			fprintf(fp, "  Clock skew: %dsec\n",
 			    rai->clockskew);
-		for (first = 1, pfx = rai->prefix.next; pfx != &rai->prefix;
+		TAILQ_FOREACH(pfx, &rai->prefix, next) {
-		     pfx = pfx->next) {
+			if (pfx == TAILQ_FIRST(&rai->prefix))
 			if (first) {
 				fprintf(fp, "  Prefixes:\n");
 				first = 0;
 			fprintf(fp, "    %s/%d(",
 			    inet_ntop(AF_INET6, &pfx->prefix, prefixbuf,
 			    sizeof(prefixbuf)), pfx->prefixlen);
 			switch (pfx->origin) {
 			case PREFIX_FROM_KERNEL:
 				fprintf(fp, "KERNEL, ");
 				break;
 			case PREFIX_FROM_CONFIG:
 				fprintf(fp, "CONFIG, ");
 				break;
 			case PREFIX_FROM_DYNAMIC:
 				fprintf(fp, "DYNAMIC, ");
 				break;
 @@ -200,52 +196,82 @@ if_dump()
 				pfx->autoconfflg ? "A" : "",
 				"");
 			if (pfx->timer) {
 				struct timeval *rest;
 				rest = rtadvd_timer_rest(pfx->timer);
 				if (rest) { /* XXX: what if not? */
 					fprintf(fp, ", expire in: %ld",
 					    (long)rest->tv_sec);
+				}
+			}
 			fprintf(fp, ")\n");
+		}
 #ifdef ROUTEINFO
-		for (first = 1, rti = rai->route.next; rti != &rai->route;
+		TAILQ_FOREACH(rti, &rai->route, next) {
-		     rti = rti->next) {
+			if (rti == TAILQ_FIRST(&rai->route))
 			if (first) {
 				fprintf(fp, "  Route Information:\n");
 				first = 0;
 			fprintf(fp, "    %s/%d (",
 				inet_ntop(AF_INET6, &rti->prefix,
 					  prefixbuf, sizeof(prefixbuf)),
 				rti->prefixlen);
 			fprintf(fp, "preference: %s, ",
 				rtpref_str[0xff & (rti->rtpref >> 3)]);
 			if (rti->ltime == ND6_INFINITE_LIFETIME)
 				fprintf(fp, "lifetime: infinity");
 			else
 				fprintf(fp, "lifetime: %ld", (long)rti->ltime);
 			fprintf(fp, ")\n");
+		}
 #endif
 		TAILQ_FOREACH(rdns, &rai->rdnss, next) {
 			fprintf(fp, "  Recursive DNS Servers:\n");
 			if (rdns->lifetime == ND6_INFINITE_LIFETIME)
 				fprintf(fp, "    lifetime: infinity\n");
 			else
 				fprintf(fp, "    lifetime: %ld\n",
 				    (long)rdns->lifetime);
 			TAILQ_FOREACH(rdnsa, &rdns->list, next)
 				fprintf(fp, "    %s\n",
 				    inet_ntop(AF_INET6, &rdnsa->addr,
 				    prefixbuf, sizeof(prefixbuf)));
+		}
 		TAILQ_FOREACH(dnsl, &rai->dnssl, next) {
 			fprintf(fp, "  DNS Search List:\n");
 			if (dnsl->lifetime == ND6_INFINITE_LIFETIME)
 				fprintf(fp, "    lifetime: infinity\n");
 			else
 				fprintf(fp, "    lifetime: %ld\n",
 				    (long)dnsl->lifetime);
 			TAILQ_FOREACH(dnsd, &dnsl->list, next) {
 				fprintf(fp, "    ");
 				for (p = dnsd->domain, len = *p++;
 				    len != 0;
 				    len = *p++)
+				{
 					if (p != dnsd->domain)
 					    fputc('.', fp);
 					while(len-- != 0)
 					    fputc(*p++, fp);
+				}
 				fputc('\n', fp);
+			}
+		}
+	}
+}
 void
-rtadvd_dump_file(dumpfile)
+rtadvd_dump_file(const char *dumpfile)
 	char *dumpfile;
+{
 	syslog(LOG_DEBUG, "<%s> dump current status to %s", __func__,
 	    dumpfile);
 	if ((fp = fopen(dumpfile, "w")) == NULL) {
 		syslog(LOG_WARNING, "<%s> open a dump file(%s)",
 		       __func__, dumpfile);
 		return;
+	}
 	if_dump();
 	fclose(fp);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dump.h,v 1.1 2000/05/23 11:37:58 itojun Exp $	*/
+/*	$NetBSD: dump.h,v 1.2 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: dump.h,v 1.1 2000/05/23 11:31:26 itojun Exp $	*/
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -20,14 +20,14 @@
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-extern void rtadvd_dump_file __P((char *));
+extern void rtadvd_dump_file(const char *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if.c,v 1.18 2006/03/05 23:47:08 rpaulo Exp $	*/
+/*	$NetBSD: if.c,v 1.19 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: if.c,v 1.36 2004/11/30 22:32:01 suz Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -44,38 +44,38 @@
 #include <netinet/icmp6.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include "rtadvd.h"
 #include "if.h"
 #define ROUNDUP(a, size) \
 	(((a) & ((size)-1)) ? (1 + ((a) | ((size)-1))) : (a))
 #define NEXT_SA(ap) (ap) = (struct sockaddr *) \
-	((caddr_t)(ap) + ((ap)->sa_len ? ROUNDUP((ap)->sa_len,\
+	((char *)(ap) + ((ap)->sa_len ? ROUNDUP((ap)->sa_len,\
 						 sizeof(u_long)) :\
 			  			 sizeof(u_long)))
 struct if_msghdr **iflist;
 int iflist_init_ok;
 size_t ifblock_size;
 char *ifblock;
-static void get_iflist __P((char **buf, size_t *size));
+static void get_iflist(char **buf, size_t *size);
-static void parse_iflist __P((struct if_msghdr ***ifmlist_p, char *buf,
+static void parse_iflist(struct if_msghdr ***ifmlist_p, char *buf,
-		       size_t bufsize));
+		       size_t bufsize);
 static void
 get_rtaddrs(int addrs, struct sockaddr *sa, struct sockaddr **rti_info)
+{
 	int i;
 	for (i = 0; i < RTAX_MAX; i++) {
 		if (addrs & (1 << i)) {
 			rti_info[i] = sa;
 			NEXT_SA(sa);
+		}
 		else
 			rti_info[i] = NULL;
 @@ -130,54 +130,54 @@ if_getmtu(char *name)
 	freeifaddrs(ifap);
 #ifdef SIOCGIFMTU		/* XXX: this ifdef may not be necessary */
 	if (mtu == 0) {
 		struct ifreq ifr;
 		int s;
 		if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
 			return(0);
 		ifr.ifr_addr.sa_family = AF_INET6;
 		strncpy(ifr.ifr_name, name,
 			sizeof(ifr.ifr_name));
-		if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) < 0) {
+		if (ioctl(s, SIOCGIFMTU, &ifr) < 0) {
 			close(s);
 			return(0);
+		}
 		close(s);
 		mtu = ifr.ifr_mtu;
+	}
 #endif
 	return(mtu);
+}
 /* give interface index and its old flags, then new flags returned */
 int
 if_getflags(int ifindex, int oifflags)
+{
 	struct ifreq ifr;
 	int s;
 	if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
 		syslog(LOG_ERR, "<%s> socket: %s", __func__,
 		       strerror(errno));
 		return (oifflags & ~IFF_UP);
+	}
 	if_indextoname(ifindex, ifr.ifr_name);
-	if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
+	if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
 		syslog(LOG_ERR, "<%s> ioctl:SIOCGIFFLAGS: failed for %s",
 		       __func__, ifr.ifr_name);
 		close(s);
 		return (oifflags & ~IFF_UP);
+	}
 	close(s);
 	return (ifr.ifr_flags);
+}
 #define ROUNDUP8(a) (1 + (((a) - 1) | 7))
 int
 lladdropt_length(struct sockaddr_dl *sdl)
+{
 @@ -345,39 +345,39 @@ get_ifam_ifindex(char *buf)
 int
 get_ifm_flags(char *buf)
+{
 	struct if_msghdr *ifm = (struct if_msghdr *)buf;
 	return (ifm->ifm_flags);
+}
 int
 get_prefixlen(char *buf)
+{
 	struct rt_msghdr *rtm = (struct rt_msghdr *)buf;
 	struct sockaddr *sa, *rti_info[RTAX_MAX];
-	u_char *p, *lim;
+	unsigned char *p, *lim;
 	sa = (struct sockaddr *)(rtm + 1);
 	get_rtaddrs(rtm->rtm_addrs, sa, rti_info);
 	sa = rti_info[RTAX_NETMASK];
-	p = (u_char *)(&SIN6(sa)->sin6_addr);
+	p = (unsigned char *)(&SIN6(sa)->sin6_addr);
-	lim = (u_char *)sa + sa->sa_len;
+	lim = (unsigned char *)sa + sa->sa_len;
 	return prefixlen(p, lim);
+}
 int
-prefixlen(u_char *p, u_char *lim)
+prefixlen(const unsigned char *p, const unsigned char *lim)
+{
 	int masklen;
 	for (masklen = 0; p < lim; p++) {
 		switch (*p) {
 		case 0xff:
 			masklen += 8;
 			break;
 		case 0xfe:
 			masklen += 7;
 			break;
 		case 0xfc:
 			masklen += 6;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if.h,v 1.7 2006/03/05 23:47:08 rpaulo Exp $	*/
+/*	$NetBSD: if.h,v 1.8 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: if.h,v 1.12 2003/09/21 07:17:03 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -27,31 +27,31 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #define RTADV_TYPE2BITMASK(type) (0x1 << type)
 extern struct if_msghdr **iflist;
 extern size_t ifblock_size;
 extern char *ifblock;
 struct nd_opt_hdr;
-struct sockaddr_dl *if_nametosdl __P((char *));
+struct sockaddr_dl *if_nametosdl(char *);
-int if_getmtu __P((char *));
+int if_getmtu(char *);
-int if_getflags __P((int, int));
+int if_getflags(int, int);
-int lladdropt_length __P((struct sockaddr_dl *));
+int lladdropt_length(struct sockaddr_dl *);
-void lladdropt_fill __P((struct sockaddr_dl *, struct nd_opt_hdr *));
+void lladdropt_fill(struct sockaddr_dl *, struct nd_opt_hdr *);
-char *get_next_msg __P((char *, char *, int, size_t *, int));
+char *get_next_msg(char *, char *, int, size_t *, int);
-struct in6_addr *get_addr __P((char *));
+struct in6_addr *get_addr(char *);
-int get_rtm_ifindex __P((char *));
+int get_rtm_ifindex(char *);
-int get_ifm_ifindex __P((char *));
+int get_ifm_ifindex(char *);
-int get_ifam_ifindex __P((char *));
+int get_ifam_ifindex(char *);
-int get_ifm_flags __P((char *));
+int get_ifm_flags(char *);
-int get_prefixlen __P((char *));
+int get_prefixlen(char *);
-int prefixlen __P((u_char *, u_char *));
+int prefixlen(const unsigned char *, const unsigned char *);
-int rtmsg_type __P((char *));
+int rtmsg_type(char *);
-int ifmsg_type __P((char *));
+int ifmsg_type(char *);
-int rtmsg_len __P((char *));
+int rtmsg_len(char *);
-int ifmsg_len __P((char *));
+int ifmsg_len(char *);
-void init_iflist __P((void));
+void init_iflist(void);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rrenum.c,v 1.13 2006/05/11 08:35:47 mrg Exp $	*/
+/*	$NetBSD: rrenum.c,v 1.14 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: rrenum.c,v 1.14 2004/06/14 05:36:00 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -150,27 +150,27 @@ do_use_prefix(int len, struct rr_pco_mat
 		if (rpm->rpm_code == RPM_PCO_ADD)
 			return;
 		irr->irr_u_uselen = 0;
 		irr->irr_u_keeplen = 0;
 		irr->irr_raf_mask_onlink = 0;
 		irr->irr_raf_mask_auto = 0;
 		irr->irr_vltime = 0;
 		irr->irr_pltime = 0;
 		memset(&irr->irr_flags, 0, sizeof(irr->irr_flags));
 		irr->irr_useprefix.sin6_len = 0; /* let it mean, no addition */
 		irr->irr_useprefix.sin6_family = 0;
 		irr->irr_useprefix.sin6_addr = in6addr_any;
-		if (ioctl(s, rrcmd2pco[rpm->rpm_code], (caddr_t)irr) < 0 &&
+		if (ioctl(s, rrcmd2pco[rpm->rpm_code], irr) < 0 &&
 		    errno != EADDRNOTAVAIL)
 			syslog(LOG_ERR, "<%s> ioctl: %s", __func__,
 			       strerror(errno));
 		return;
+	}
 	for (rpu = (struct rr_pco_use *)(rpm + 1),
 	     rpulim = (struct rr_pco_use *)((char *)rpm + len);
 	     rpu < rpulim;
 	     rpu += 1) {
 		/* init in6_rrenumreq fields */
 		irr->irr_u_uselen = rpu->rpu_uselen;
 		irr->irr_u_keeplen = rpu->rpu_keeplen;
 @@ -182,41 +182,40 @@ do_use_prefix(int len, struct rr_pco_mat
 		irr->irr_pltime = ntohl(rpu->rpu_pltime);
 		irr->irr_raf_onlink =
 			(rpu->rpu_raflags & ICMP6_RR_PCOUSE_RAFLAGS_ONLINK) == 0 ? 0 : 1;
 		irr->irr_raf_auto =
 			(rpu->rpu_raflags & ICMP6_RR_PCOUSE_RAFLAGS_AUTO) == 0 ? 0 : 1;
 		irr->irr_rrf_decrvalid =
 			(rpu->rpu_flags & ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME) == 0 ? 0 : 1;
 		irr->irr_rrf_decrprefd =
 			(rpu->rpu_flags & ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME) == 0 ? 0 : 1;
 		irr->irr_useprefix.sin6_len = sizeof(irr->irr_useprefix);
 		irr->irr_useprefix.sin6_family = AF_INET6;
 		irr->irr_useprefix.sin6_addr = rpu->rpu_prefix;
-		if (ioctl(s, rrcmd2pco[rpm->rpm_code], (caddr_t)irr) < 0 &&
+		if (ioctl(s, rrcmd2pco[rpm->rpm_code], irr) < 0 &&
 		    errno != EADDRNOTAVAIL)
 			syslog(LOG_ERR, "<%s> ioctl: %s", __func__,
 			       strerror(errno));
 		/* very adhoc: should be rewritten */
 		if (rpm->rpm_code == RPM_PCO_CHANGE &&
 		    IN6_ARE_ADDR_EQUAL(&rpm->rpm_prefix, &rpu->rpu_prefix) &&
 		    rpm->rpm_matchlen == rpu->rpu_uselen &&
 		    rpu->rpu_uselen == rpu->rpu_keeplen) {
 			if ((rai = if_indextorainfo(ifindex)) == NULL)
 				continue; /* non-advertising IF */
-			for (pp = rai->prefix.next; pp != &rai->prefix;
+			TAILQ_FOREACH(pp, &rai->prefix, next) {
 			     pp = pp->next) {
 				struct timeval now;
 				if (prefix_match(&pp->prefix, pp->prefixlen,
 						 &rpm->rpm_prefix,
 						 rpm->rpm_matchlen)) {
 					/* change parameters */
 					pp->validlifetime = ntohl(rpu->rpu_vltime);
 					pp->preflifetime = ntohl(rpu->rpu_pltime);
 					if (irr->irr_rrf_decrvalid) {
 						gettimeofday(&now, 0);
 						pp->vltimeexpire =
 							now.tv_sec + pp->validlifetime;
 					} else
 @@ -278,98 +277,98 @@ do_pco(struct icmp6_router_renum *rr, in
 		syslog(LOG_ERR, "<%s> if_indextoname: %s", __func__,
 		       strerror(errno));
 		return 1;
+	}
 	return 0;
+}
 /*
  * call do_pco() for each Prefix Control Operations(PCOs) in a received
  * Router Renumbering Command packet.
  * return 0 on success, 1 on failure
  */
 static int
-do_rr(int len, struct icmp6_router_renum *rr)
+do_rr(size_t len, struct icmp6_router_renum *rr)
+{
 	struct rr_pco_match *rpm;
 	char *cp, *lim;
 	lim = (char *)rr + len;
 	cp = (char *)(rr + 1);
 	len -= sizeof(struct icmp6_router_renum);
 	/* get iflist block from kernel again, to get up-to-date information */
 	init_iflist();
 	while (cp < lim) {
-		int rpmlen;
+		size_t rpmlen;
 		rpm = (struct rr_pco_match *)cp;
 		if (len < sizeof(struct rr_pco_match)) {
 		    tooshort:
-			syslog(LOG_ERR, "<%s> pkt too short. left len = %d. "
+			syslog(LOG_ERR, "<%s> pkt too short. left len = %zd. "
 			       "gabage at end of pkt?", __func__, len);
 			return 1;
+		}
 		rpmlen = rpm->rpm_len << 3;
 		if (len < rpmlen)
 			goto tooshort;
 		if (do_pco(rr, rpmlen, rpm)) {
 			syslog(LOG_WARNING, "<%s> invalid PCO", __func__);
 			goto next;
+		}
 	    next:
 		cp += rpmlen;
 		len -= rpmlen;
+	}
 	return 0;
+}
 /*
  * check validity of a router renumbering command packet
  * return 0 on success, 1 on failure
  */
 static int
-rr_command_check(int len, struct icmp6_router_renum *rr, struct in6_addr *from,
+rr_command_check(size_t len, struct icmp6_router_renum *rr,
-		 struct in6_addr *dst)
+    struct in6_addr *from, struct in6_addr *dst)
+{
 	char ntopbuf[INET6_ADDRSTRLEN];
 	/* omit rr minimal length check. hope kernel have done it. */
 	/* rr_command length check */
 	if (len < (sizeof(struct icmp6_router_renum) +
 		   sizeof(struct rr_pco_match))) {
-		syslog(LOG_ERR,	"<%s> rr_command len %d is too short",
+		syslog(LOG_ERR,	"<%s> rr_command len %zd is too short",
 		       __func__, len);
 		return 1;
+	}
 	/* destination check. only for multicast. omit unicast check. */
 	if (IN6_IS_ADDR_MULTICAST(dst) && !IN6_IS_ADDR_MC_LINKLOCAL(dst) &&
 	    !IN6_IS_ADDR_MC_SITELOCAL(dst)) {
 		syslog(LOG_ERR,	"<%s> dst mcast addr %s is illegal",
 		       __func__,
 		       inet_ntop(AF_INET6, dst, ntopbuf, INET6_ADDRSTRLEN));
 		return 1;
+	}
 	/* seqnum and segnum check */
 	if (rro.rro_seqnum > rr->rr_seqnum) {
 		syslog(LOG_WARNING,
 		       "<%s> rcvd old seqnum %d from %s",
-		       __func__, (u_int32_t)ntohl(rr->rr_seqnum),
+		       __func__, (uint32_t)ntohl(rr->rr_seqnum),
 		       inet_ntop(AF_INET6, from, ntopbuf, INET6_ADDRSTRLEN));
 		return 1;
+	}
 	if (rro.rro_seqnum == rr->rr_seqnum &&
 	    (rr->rr_flags & ICMP6_RR_FLAGS_TEST) == 0 &&
 	    RR_ISSET_SEGNUM(rro.rro_segnum_bits, rr->rr_segnum)) {
 		if ((rr->rr_flags & ICMP6_RR_FLAGS_REQRESULT) != 0)
 			syslog(LOG_WARNING,
 			       "<%s> rcvd duped segnum %d from %s",
 			       __func__, rr->rr_segnum,
 			       inet_ntop(AF_INET6, from, ntopbuf,
 					 INET6_ADDRSTRLEN));
 		return 0;
 @@ -405,61 +404,63 @@ rr_command_input(int len, struct icmp6_r
+	}
 	/* update segnum */
 	RR_SET_SEGNUM(rro.rro_segnum_bits, rr->rr_segnum);
 	return;
     failed:
 	syslog(LOG_ERR, "<%s> received RR was invalid", __func__);
 	return;
+}
 void
-rr_input(int len, struct icmp6_router_renum *rr, struct in6_pktinfo *pi,
+rr_input(size_t len, struct icmp6_router_renum *rr, struct in6_pktinfo *pi,
 	 struct sockaddr_in6 *from, struct in6_addr *dst)
+{
 	char ntopbuf[2][INET6_ADDRSTRLEN], ifnamebuf[IFNAMSIZ];
 	syslog(LOG_DEBUG,
 	       "<%s> RR received from %s to %s on %s",
 	       __func__,
 	       inet_ntop(AF_INET6, &from->sin6_addr,
 			 ntopbuf[0], INET6_ADDRSTRLEN),
 	       inet_ntop(AF_INET6, &dst, ntopbuf[1], INET6_ADDRSTRLEN),
 	       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 	/* packet validation based on Section 4.1 of RFC2894 */
 	if (len < sizeof(struct icmp6_router_renum)) {
 		syslog(LOG_NOTICE,
-		       "<%s>: RR short message (size %d) from %s to %s on %s",
+		       "<%s>: RR short message (size %zd) from %s to %s on %s",
 		       __func__, len,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf[0], INET6_ADDRSTRLEN),
 		       inet_ntop(AF_INET6, &dst, ntopbuf[1], INET6_ADDRSTRLEN),
 		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		return;
+	}
 	/*
 	 * If the IPv6 destination address is neither an All Routers multicast
 	 * address [AARCH] nor one of the receiving router's unicast addresses,
 	 * the message MUST be discarded and SHOULD be logged to network
 	 * management.
 	 * We rely on the kernel input routine for unicast addresses, and thus
 	 * check multicast destinations only.
 	 */
 	if (IN6_IS_ADDR_MULTICAST(&pi->ipi6_addr) &&
-	    !IN6_ARE_ADDR_EQUAL(&in6a_site_allrouters, &pi->ipi6_addr)) {
+	    !IN6_ARE_ADDR_EQUAL(&sin6_sitelocal_allrouters.sin6_addr,
 	    &pi->ipi6_addr))
+	{
 		syslog(LOG_NOTICE,
 		       "<%s>: RR message with invalid destination (%s) "
 		       "from %s on %s",
 		       __func__,
 		       inet_ntop(AF_INET6, &dst, ntopbuf[0], INET6_ADDRSTRLEN),
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf[1], INET6_ADDRSTRLEN),
 		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		return;
+	}
 	rr_rcvifindex = pi->ipi6_ifindex;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rrenum.h,v 1.4 2001/01/21 15:39:33 itojun Exp $	*/
+/*	$NetBSD: rrenum.h,v 1.5 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: rrenum.h,v 1.3 2001/01/21 15:37:14 itojun Exp $	*/
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -20,15 +20,15 @@
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-void rr_input __P((int, struct icmp6_router_renum *, struct in6_pktinfo *,
+void rr_input(size_t, struct icmp6_router_renum *, struct in6_pktinfo *,
-	struct sockaddr_in6 *, struct in6_addr *));
+	struct sockaddr_in6 *, struct in6_addr *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtadvd.c,v 1.35 2009/04/19 08:40:48 lukem Exp $	*/
+/*	$NetBSD: rtadvd.c,v 1.36 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: rtadvd.c,v 1.92 2005/10/17 14:40:02 suz Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -56,106 +56,125 @@
 #include <syslog.h>
 #include <util.h>
 #include <poll.h>
 #include "rtadvd.h"
 #include "rrenum.h"
 #include "advcap.h"
 #include "timer.h"
 #include "if.h"
 #include "config.h"
 #include "dump.h"
 struct msghdr rcvmhdr;
-static u_char *rcvcmsgbuf;
+static unsigned char *rcvcmsgbuf;
 static size_t rcvcmsgbuflen;
-static u_char *sndcmsgbuf = NULL;
+static unsigned char *sndcmsgbuf = NULL;
 static size_t sndcmsgbuflen;
 volatile sig_atomic_t do_dump;
 volatile sig_atomic_t do_die;
 struct msghdr sndmhdr;
 struct iovec rcviov[2];
 struct iovec sndiov[2];
 struct sockaddr_in6 rcvfrom;
-struct sockaddr_in6 sin6_allnodes = {sizeof(sin6_allnodes), AF_INET6};
+static const char *dumpfilename = "/var/run/rtadvd.dump"; /* XXX configurable */
 struct in6_addr in6a_site_allrouters;
 static char *dumpfilename = "/var/run/rtadvd.dump"; /* XXX: should be configurable */
 static char *mcastif;
 int sock;
 int rtsock = -1;
 int accept_rr = 0;
 int dflag = 0, sflag = 0;
 char *conffile = NULL;
-struct rainfo *ralist = NULL;
+struct ralist_head_t ralist = TAILQ_HEAD_INITIALIZER(ralist);
 struct nd_optlist {
-	struct nd_optlist *next;
+	TAILQ_ENTRY(nd_optlist) next;
 	struct nd_opt_hdr *opt;
 };
 union nd_opts {
 	struct nd_opt_hdr *nd_opt_array[9];
 	struct {
 		struct nd_opt_hdr *zero;
 		struct nd_opt_hdr *src_lladdr;
 		struct nd_opt_hdr *tgt_lladdr;
 		struct nd_opt_prefix_info *pi;
 		struct nd_opt_rd_hdr *rh;
 		struct nd_opt_mtu *mtu;
-		struct nd_optlist *list;
+		TAILQ_HEAD(, nd_optlist) list;
 	} nd_opt_each;
 };
 #define nd_opts_src_lladdr	nd_opt_each.src_lladdr
 #define nd_opts_tgt_lladdr	nd_opt_each.tgt_lladdr
 #define nd_opts_pi		nd_opt_each.pi
 #define nd_opts_rh		nd_opt_each.rh
 #define nd_opts_mtu		nd_opt_each.mtu
 #define nd_opts_list		nd_opt_each.list
-#define NDOPT_FLAG_SRCLINKADDR 0x1
+#define NDOPT_FLAG_SRCLINKADDR	(1 << 0)
-#define NDOPT_FLAG_TGTLINKADDR 0x2
+#define NDOPT_FLAG_TGTLINKADDR	(1 << 1)
-#define NDOPT_FLAG_PREFIXINFO 0x4
+#define NDOPT_FLAG_PREFIXINFO	(1 << 2)
-#define NDOPT_FLAG_RDHDR 0x8
+#define NDOPT_FLAG_RDHDR	(1 << 3)
-#define NDOPT_FLAG_MTU 0x10
+#define NDOPT_FLAG_MTU		(1 << 4)
 #define NDOPT_FLAG_RDNSS	(1 << 5)
-u_int32_t ndopt_flags[] = {
+#define NDOPT_FLAG_DNSSL	(1 << 6)
 , NDOPT_FLAG_SRCLINKADDR, NDOPT_FLAG_TGTLINKADDR,
-	NDOPT_FLAG_PREFIXINFO, NDOPT_FLAG_RDHDR, NDOPT_FLAG_MTU,
+uint32_t ndopt_flags[] = {
 	[ND_OPT_SOURCE_LINKADDR] =	NDOPT_FLAG_SRCLINKADDR,
 	[ND_OPT_TARGET_LINKADDR] =	NDOPT_FLAG_TGTLINKADDR,
 	[ND_OPT_PREFIX_INFORMATION] =	NDOPT_FLAG_PREFIXINFO,
 	[ND_OPT_REDIRECTED_HEADER] =	NDOPT_FLAG_RDHDR,
 	[ND_OPT_MTU] =			NDOPT_FLAG_MTU,
 	[ND_OPT_RDNSS] =		NDOPT_FLAG_RDNSS,
 	[ND_OPT_DNSSL] =		NDOPT_FLAG_DNSSL,
 };
 struct sockaddr_in6 sin6_linklocal_allnodes = {
 	.sin6_len =	sizeof(sin6_linklocal_allnodes),
 	.sin6_family =	AF_INET6,
 	.sin6_addr =	IN6ADDR_LINKLOCAL_ALLNODES_INIT,
 };
 struct sockaddr_in6 sin6_linklocal_allrouters = {
 	.sin6_len =	sizeof(sin6_linklocal_allrouters),
 	.sin6_family =	AF_INET6,
 	.sin6_addr =	IN6ADDR_LINKLOCAL_ALLROUTERS_INIT,
 };
 struct sockaddr_in6 sin6_sitelocal_allrouters = {
 	.sin6_len =	sizeof(sin6_sitelocal_allrouters),
 	.sin6_family =	AF_INET6,
 	.sin6_addr =	IN6ADDR_SITELOCAL_ALLROUTERS_INIT,
 };
-int main __P((int, char *[]));
+int main(int, char *[]);
-static void set_die __P((int));
+static void set_die(int);
-static void die __P((void));
+static void die(void);
-static void sock_open __P((void));
+static void sock_open(void);
-static void rtsock_open __P((void));
+static void rtsock_open(void);
-static void rtadvd_input __P((void));
+static void rtadvd_input(void);
-static void rs_input __P((int, struct nd_router_solicit *,
+static void rs_input(int, struct nd_router_solicit *,
-			  struct in6_pktinfo *, struct sockaddr_in6 *));
+    struct in6_pktinfo *, struct sockaddr_in6 *);
-static void ra_input __P((int, struct nd_router_advert *,
+static void ra_input(int, struct nd_router_advert *,
-			  struct in6_pktinfo *, struct sockaddr_in6 *));
+    struct in6_pktinfo *, struct sockaddr_in6 *);
-static int prefix_check __P((struct nd_opt_prefix_info *, struct rainfo *,
+static int prefix_check(struct nd_opt_prefix_info *, struct rainfo *,
-			     struct sockaddr_in6 *));
+    struct sockaddr_in6 *);
-static int nd6_options __P((struct nd_opt_hdr *, int,
+static int nd6_options(struct nd_opt_hdr *, int, union nd_opts *, uint32_t);
-			    union nd_opts *, u_int32_t));
+static void free_ndopts(union nd_opts *);
-static void free_ndopts __P((union nd_opts *));
+static void ra_output(struct rainfo *);
-static void ra_output __P((struct rainfo *));
+static void rtmsg_input(void);
-static void rtmsg_input __P((void));
+static void rtadvd_set_dump_file(int);
-static void rtadvd_set_dump_file __P((int));
+static void set_short_delay(struct rainfo *);
 static void set_short_delay __P((struct rainfo *));
 int
-main(argc, argv)
+main(int argc, char *argv[])
 	int argc;
 	char *argv[];
+{
 	struct pollfd set[2];
 	struct timeval *timeout;
 	int i, ch;
 	int fflag = 0, logopt;
 	/* get command line options and arguments */
 #define OPTIONS "c:dDfM:Rs"
 	while ((ch = getopt(argc, argv, OPTIONS)) != -1) {
 #undef OPTIONS
 		switch (ch) {
 		case 'c':
 			conffile = optarg;
 @@ -202,31 +221,26 @@ main(argc, argv)
 		(void)setlogmask(LOG_UPTO(LOG_ERR));
 	if (dflag == 1)
 		(void)setlogmask(LOG_UPTO(LOG_INFO));
 	/* timer initialization */
 	rtadvd_timer_init();
 	/* get iflist block from kernel */
 	init_iflist();
 	while (argc--)
 		getconfig(*argv++);
 	if (inet_pton(AF_INET6, ALLNODES, &sin6_allnodes.sin6_addr) != 1) {
 		fprintf(stderr, "fatal: inet_pton failed\n");
 		exit(1);
 	if (!fflag)
 		daemon(1, 0);
 	sock_open();
 	/* record the current PID */
 	if (pidfile(NULL) < 0) {
 		syslog(LOG_ERR,
 		    "<%s> failed to open the pid log file, run anyway.",
 		    __func__);
+	}
 	set[0].fd = sock;
 @@ -276,66 +290,64 @@ main(argc, argv)
 			continue;
+		}
 		if (i == 0)	/* timeout */
 			continue;
 		if (rtsock != -1 && set[1].revents & POLLIN)
 			rtmsg_input();
 		if (set[0].revents & POLLIN)
 			rtadvd_input();
+	}
 	exit(0);		/* NOTREACHED */
+}
 static void
-rtadvd_set_dump_file(sig)
+rtadvd_set_dump_file(int sig)
 	int sig;
+{
 	do_dump = 1;
+}
 static void
-set_die(sig)
+set_die(int sig)
 	int sig;
+{
 	do_die = 1;
+}
 static void
-die()
+die(void)
+{
 	struct rainfo *ra;
 	int i;
 	const int retrans = MAX_FINAL_RTR_ADVERTISEMENTS;
 	if (dflag > 1) {
 		syslog(LOG_DEBUG, "<%s> cease to be an advertising router\n",
 		    __func__);
+	}
-	for (ra = ralist; ra; ra = ra->next) {
+	TAILQ_FOREACH(ra, &ralist, next) {
 		ra->lifetime = 0;
 		make_packet(ra);
+	}
 	for (i = 0; i < retrans; i++) {
-		for (ra = ralist; ra; ra = ra->next)
+		TAILQ_FOREACH(ra, &ralist, next)
 			ra_output(ra);
 		sleep(MIN_DELAY_BETWEEN_RAS);
+	}
 	exit(0);
 	/*NOTREACHED*/
+}
 static void
-rtmsg_input()
+rtmsg_input(void)
+{
 	int n, type, ifindex = 0, plen;
 	size_t len;
 	union rt_msghdr_buf {
 		struct rt_msghdr	rt_msghdr;
 		char			data[2048];
 	} buffer;
 	char *msg, *next, *lim;
 	char ifname[IF_NAMESIZE];
 	struct prefix *prefix;
 	struct rainfo *rai;
 	struct in6_addr *addr;
 	char addrbuf[INET6_ADDRSTRLEN];
 @@ -535,29 +547,29 @@ rtmsg_input()
 			/*
 			 * An advertised prefix has been added or invalidated.
 			 * Will notice the change in a short delay.
 			 */
 			rai->initcounter = 0;
 			set_short_delay(rai);
+		}
+	}
 	return;
+}
 void
-rtadvd_input()
+rtadvd_input(void)
+{
-	int i;
+	ssize_t i;
 	int *hlimp = NULL;
 #ifdef OLDRAWSOCKET
 	struct ip6_hdr *ip;
 #endif
 	struct icmp6_hdr *icp;
 	int ifindex = 0;
 	struct cmsghdr *cm;
 	struct in6_pktinfo *pi = NULL;
 	char ntopbuf[INET6_ADDRSTRLEN], ifnamebuf[IFNAMSIZ];
 	struct in6_addr dst = in6addr_any;
 	/*
 	 * Get message. We reset msg_controllen since the field could
 @@ -600,39 +612,39 @@ rtadvd_input()
 	/*
 	 * If we happen to receive data on an interface which is now down,
 	 * just discard the data.
 	 */
 	if ((iflist[pi->ipi6_ifindex]->ifm_flags & IFF_UP) == 0) {
 		syslog(LOG_INFO,
 		       "<%s> received data on a disabled interface (%s)",
 		       __func__,
 		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		return;
+	}
 #ifdef OLDRAWSOCKET
-	if (i < sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr)) {
+	if ((size_t)i < sizeof(struct ip6_hdr) + sizeof(struct icmp6_hdr)) {
 		syslog(LOG_ERR,
 		       "<%s> packet size(%d) is too short",
 		       __func__, i);
 		return;
+	}
 	ip = (struct ip6_hdr *)rcvmhdr.msg_iov[0].iov_base;
 	icp = (struct icmp6_hdr *)(ip + 1); /* XXX: ext. hdr? */
 #else
-	if (i < sizeof(struct icmp6_hdr)) {
+	if ((size_t)i < sizeof(struct icmp6_hdr)) {
 		syslog(LOG_ERR,
-		       "<%s> packet size(%d) is too short",
+		       "<%s> packet size(%zd) is too short",
 		       __func__, i);
 		return;
+	}
 	icp = (struct icmp6_hdr *)rcvmhdr.msg_iov[0].iov_base;
 #endif
 	switch (icp->icmp6_type) {
 	case ND_ROUTER_SOLICIT:
 		/*
 		 * Message verification - RFC-2461 6.1.1
 		 * XXX: these checks must be done in the kernel as well,
 		 *      but we can't completely rely on them.
 @@ -647,30 +659,30 @@ rtadvd_input()
 			    if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 			return;
+		}
 		if (icp->icmp6_code) {
 			syslog(LOG_NOTICE,
 			    "<%s> RS with invalid ICMP6 code(%d) "
 			    "received from %s on %s",
 			    __func__, icp->icmp6_code,
 			    inet_ntop(AF_INET6, &rcvfrom.sin6_addr, ntopbuf,
 			    INET6_ADDRSTRLEN),
 			    if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 			return;
+		}
-		if (i < sizeof(struct nd_router_solicit)) {
+		if ((size_t)i < sizeof(struct nd_router_solicit)) {
 			syslog(LOG_NOTICE,
 			    "<%s> RS from %s on %s does not have enough "
-			    "length (len = %d)",
+			    "length (len = %zd)",
 			    __func__,
 			    inet_ntop(AF_INET6, &rcvfrom.sin6_addr, ntopbuf,
 			    INET6_ADDRSTRLEN),
 			    if_indextoname(pi->ipi6_ifindex, ifnamebuf), i);
 			return;
+		}
 		rs_input(i, (struct nd_router_solicit *)icp, pi, &rcvfrom);
 		break;
 	case ND_ROUTER_ADVERT:
 		/*
 		 * Message verification - RFC-2461 6.1.2
 		 * XXX: there's a same dilemma as above...
 		 */
 @@ -684,30 +696,30 @@ rtadvd_input()
 			    if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 			return;
+		}
 		if (icp->icmp6_code) {
 			syslog(LOG_NOTICE,
 			    "<%s> RA with invalid ICMP6 code(%d) "
 			    "received from %s on %s",
 			    __func__, icp->icmp6_code,
 			    inet_ntop(AF_INET6, &rcvfrom.sin6_addr, ntopbuf,
 			    INET6_ADDRSTRLEN),
 			    if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 			return;
+		}
-		if (i < sizeof(struct nd_router_advert)) {
+		if ((size_t)i < sizeof(struct nd_router_advert)) {
 			syslog(LOG_NOTICE,
 			    "<%s> RA from %s on %s does not have enough "
-			    "length (len = %d)",
+			    "length (len = %zd)",
 			    __func__,
 			    inet_ntop(AF_INET6, &rcvfrom.sin6_addr, ntopbuf,
 			    INET6_ADDRSTRLEN),
 			    if_indextoname(pi->ipi6_ifindex, ifnamebuf), i);
 			return;
+		}
 		ra_input(i, (struct nd_router_advert *)icp, pi, &rcvfrom);
 		break;
 	case ICMP6_ROUTER_RENUMBERING:
 		if (accept_rr == 0) {
 			syslog(LOG_ERR, "<%s> received a router renumbering "
 			    "message, but not allowed to be accepted",
 			    __func__);
 @@ -739,26 +751,27 @@ rs_input(int len, struct nd_router_solic
 	union nd_opts ndopts;
 	struct rainfo *ra;
 	struct soliciter *sol;
 	syslog(LOG_DEBUG,
 	       "<%s> RS received from %s on %s",
 	       __func__,
 	       inet_ntop(AF_INET6, &from->sin6_addr,
 			 ntopbuf, INET6_ADDRSTRLEN),
 	       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 	/* ND option check */
 	memset(&ndopts, 0, sizeof(ndopts));
 	TAILQ_INIT(&ndopts.nd_opts_list);
 	if (nd6_options((struct nd_opt_hdr *)(rs + 1),
 			len - sizeof(struct nd_router_solicit),
 			&ndopts, NDOPT_FLAG_SRCLINKADDR)) {
 		syslog(LOG_INFO,
 		       "<%s> ND option check failed for an RS from %s on %s",
 		       __func__,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		return;
+	}
 	/*
 @@ -766,74 +779,70 @@ rs_input(int len, struct nd_router_solic
 	 * must be no source link-layer address option in the message.
 	 * (RFC-2461 6.1.1)
 	 */
 	if (IN6_IS_ADDR_UNSPECIFIED(&from->sin6_addr) &&
 	    ndopts.nd_opts_src_lladdr) {
 		syslog(LOG_INFO,
 		       "<%s> RS from unspecified src on %s has a link-layer"
 		       " address option",
 		       __func__,
 		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		goto done;
+	}
-	ra = ralist;
+	TAILQ_FOREACH(ra, &ralist, next) {
 	while (ra != NULL) {
 		if (pi->ipi6_ifindex == ra->ifindex)
 			break;
 		ra = ra->next;
+	}
 	if (ra == NULL) {
 		syslog(LOG_INFO,
 		       "<%s> RS received on non advertising interface(%s)",
 		       __func__,
 		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		goto done;
+	}
 	ra->rsinput++;		/* increment statistics */
 	/*
 	 * Decide whether to send RA according to the rate-limit
 	 * consideration.
 	 */
 	/* record sockaddr waiting for RA, if possible */
-	sol = (struct soliciter *)malloc(sizeof(*sol));
+	sol = malloc(sizeof(*sol));
 	if (sol) {
 		sol->addr = *from;
 		/* XXX RFC2553 need clarification on flowinfo */
 		sol->addr.sin6_flowinfo = 0;
-		sol->next = ra->soliciter;
+		TAILQ_INSERT_HEAD(&ra->soliciter, sol, next);
 		ra->soliciter = sol;
+	}
 	/*
 	 * If there is already a waiting RS packet, don't
 	 * update the timer.
 	 */
 	if (ra->waiting++)
 		goto done;
 	set_short_delay(ra);
 done:
 	free_ndopts(&ndopts);
 	return;
+}
 static void
-set_short_delay(rai)
+set_short_delay(struct rainfo *rai)
 	struct rainfo *rai;
+{
 	long delay;	/* must not be greater than 1000000 */
 	struct timeval interval, now, min_delay, tm_tmp, *rest;
 	/*
 	 * Compute a random delay. If the computed value
 	 * corresponds to a time later than the time the next
 	 * multicast RA is scheduled to be sent, ignore the random
 	 * delay and send the advertisement at the
 	 * already-scheduled time. RFC2461 6.2.6
 	 */
 	delay = arc4random() % MAX_RA_DELAY_TIME;
 	interval.tv_sec = 0;
 @@ -860,49 +869,53 @@ set_short_delay(rai)
 		TIMEVAL_SUB(&min_delay, &tm_tmp, &min_delay);
 		TIMEVAL_ADD(&min_delay, &interval, &interval);
+	}
 	rtadvd_set_timer(&interval, rai->timer);
+}
 static void
 ra_input(int len, struct nd_router_advert *ra,
 	 struct in6_pktinfo *pi, struct sockaddr_in6 *from)
+{
 	struct rainfo *rai;
 	char ntopbuf[INET6_ADDRSTRLEN], ifnamebuf[IFNAMSIZ];
 	union nd_opts ndopts;
-	char *on_off[] = {"OFF", "ON"};
+	const char *on_off[] = {"OFF", "ON"};
-	u_int32_t reachabletime, retranstimer, mtu;
+	uint32_t reachabletime, retranstimer, mtu;
 	struct nd_optlist *optp;
 	int inconsistent = 0;
 	syslog(LOG_DEBUG,
 	       "<%s> RA received from %s on %s",
 	       __func__,
 	       inet_ntop(AF_INET6, &from->sin6_addr,
 			 ntopbuf, INET6_ADDRSTRLEN),
 	       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 	/* ND option check */
 	memset(&ndopts, 0, sizeof(ndopts));
 	TAILQ_INIT(&ndopts.nd_opts_list);
 	if (nd6_options((struct nd_opt_hdr *)(ra + 1),
-			len - sizeof(struct nd_router_advert),
+	    len - sizeof(struct nd_router_advert),
-			&ndopts, NDOPT_FLAG_SRCLINKADDR |
+	    &ndopts, NDOPT_FLAG_SRCLINKADDR |
-			NDOPT_FLAG_PREFIXINFO | NDOPT_FLAG_MTU)) {
+	    NDOPT_FLAG_PREFIXINFO | NDOPT_FLAG_MTU |
 	    NDOPT_FLAG_RDNSS | NDOPT_FLAG_DNSSL))
+	{
 		syslog(LOG_INFO,
-		       "<%s> ND option check failed for an RA from %s on %s",
+		    "<%s> ND option check failed for an RA from %s on %s",
-		       __func__,
+		    __func__,
-		       inet_ntop(AF_INET6, &from->sin6_addr,
+		    inet_ntop(AF_INET6, &from->sin6_addr,
-				 ntopbuf, INET6_ADDRSTRLEN),
+		        ntopbuf, INET6_ADDRSTRLEN),
-		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
+		        if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		return;
+	}
 	/*
 	 * RA consistency check according to RFC-2461 6.2.7
 	 */
 	if ((rai = if_indextorainfo(pi->ipi6_ifindex)) == 0) {
 		syslog(LOG_INFO,
 		       "<%s> received RA from %s on non-advertising"
 		       " interface(%s)",
 		       __func__,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 @@ -989,55 +1002,48 @@ ra_input(int len, struct nd_router_adver
 		if (mtu && rai->linkmtu && mtu != rai->linkmtu) {
 			syslog(LOG_INFO,
 			       "<%s> MTU option value inconsistent on %s:"
 			       " %d from %s, %d from us",
 			       __func__,
 			       rai->ifname, mtu,
 			       inet_ntop(AF_INET6, &from->sin6_addr,
 					 ntopbuf, INET6_ADDRSTRLEN),
 			       rai->linkmtu);
 			inconsistent++;
+		}
+	}
 	/* Preferred and Valid Lifetimes for prefixes */
 	if (ndopts.nd_opts_pi)
-		struct nd_optlist *optp = ndopts.nd_opts_list;
+		if (prefix_check(ndopts.nd_opts_pi, rai, from))
 			inconsistent++;
-		if (ndopts.nd_opts_pi) {
+	TAILQ_FOREACH(optp, &ndopts.nd_opts_list, next)
-			if (prefix_check(ndopts.nd_opts_pi, rai, from))
+		if (prefix_check((struct nd_opt_prefix_info *)optp->opt,
-				inconsistent++;
+		    rai, from))
 			inconsistent++;
 		while (optp) {
 			if (prefix_check((struct nd_opt_prefix_info *)optp->opt,
 					 rai, from))
 				inconsistent++;
 			optp = optp->next;
 	if (inconsistent)
 		rai->rainconsistent++;
 done:
 	free_ndopts(&ndopts);
 	return;
+}
 /* return a non-zero value if the received prefix is inconsitent with ours */
 static int
 prefix_check(struct nd_opt_prefix_info *pinfo,
 	     struct rainfo *rai, struct sockaddr_in6 *from)
+{
-	u_int32_t preferred_time, valid_time;
+	uint32_t preferred_time, valid_time;
 	struct prefix *pp;
 	int inconsistent = 0;
 	char ntopbuf[INET6_ADDRSTRLEN], prefixbuf[INET6_ADDRSTRLEN];
 	struct timeval now;
 #if 0				/* impossible */
 	if (pinfo->nd_opt_pi_type != ND_OPT_PREFIX_INFORMATION)
 		return(0);
 #endif
 	/*
 	 * log if the adveritsed prefix has link-local scope(sanity check?)
 	 */
 @@ -1146,96 +1152,98 @@ prefix_check(struct nd_opt_prefix_info *
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       pp->validlifetime);
 		inconsistent++;
+	}
 	return(inconsistent);
+}
 struct prefix *
 find_prefix(struct rainfo *rai, struct in6_addr *prefix, int plen)
+{
 	struct prefix *pp;
 	int bytelen, bitlen;
-	u_char bitmask;
+	unsigned char bitmask;
-	for (pp = rai->prefix.next; pp != &rai->prefix; pp = pp->next) {
+	TAILQ_FOREACH(pp, &rai->prefix, next) {
 		if (plen != pp->prefixlen)
 			continue;
 		bytelen = plen / 8;
 		bitlen = plen % 8;
 		bitmask = 0xff << (8 - bitlen);
 		if (memcmp((void *)prefix, (void *)&pp->prefix, bytelen))
 			continue;
 		if (bitlen == 0 ||
 		    ((prefix->s6_addr[bytelen] & bitmask) ==
 		     (pp->prefix.s6_addr[bytelen] & bitmask))) {
 			return(pp);
+		}
+	}
 	return(NULL);
+}
 /* check if p0/plen0 matches p1/plen1; return 1 if matches, otherwise 0. */
 int
 prefix_match(struct in6_addr *p0, int plen0,
 	     struct in6_addr *p1, int plen1)
+{
 	int bytelen, bitlen;
-	u_char bitmask;
+	unsigned char bitmask;
 	if (plen0 < plen1)
 		return(0);
 	bytelen = plen1 / 8;
 	bitlen = plen1 % 8;
 	bitmask = 0xff << (8 - bitlen);
 	if (memcmp((void *)p0, (void *)p1, bytelen))
 		return(0);
 	if (bitlen == 0 ||
 	    ((p0->s6_addr[bytelen] & bitmask) ==
 	     (p1->s6_addr[bytelen] & bitmask))) {
 		return(1);
+	}
 	return(0);
+}
 static int
 nd6_options(struct nd_opt_hdr *hdr, int limit,
-	    union nd_opts *ndopts, u_int32_t optflags)
+	    union nd_opts *ndopts, uint32_t optflags)
+{
 	int optlen = 0;
 	for (; limit > 0; limit -= optlen) {
-		if (limit < sizeof(struct nd_opt_hdr)) {
+		if ((size_t)limit < sizeof(struct nd_opt_hdr)) {
 			syslog(LOG_INFO, "<%s> short option header", __func__);
 			goto bad;
+		}
-		hdr = (struct nd_opt_hdr *)((caddr_t)hdr + optlen);
+		hdr = (struct nd_opt_hdr *)((char *)hdr + optlen);
 		if (hdr->nd_opt_len == 0) {
 			syslog(LOG_INFO,
 			    "<%s> bad ND option length(0) (type = %d)",
 			    __func__, hdr->nd_opt_type);
 			goto bad;
+		}
 		optlen = hdr->nd_opt_len << 3;
 		if (optlen > limit) {
 			syslog(LOG_INFO, "<%s> short option", __func__);
 			goto bad;
+		}
-		if (hdr->nd_opt_type > ND_OPT_MTU)
+		if (hdr->nd_opt_type > ND_OPT_MTU &&
 		    hdr->nd_opt_type != ND_OPT_RDNSS &&
 		    hdr->nd_opt_type != ND_OPT_DNSSL)
+		{
 			syslog(LOG_INFO, "<%s> unknown ND option(type %d)",
 			    __func__, hdr->nd_opt_type);
 			continue;
+		}
 		if ((ndopt_flags[hdr->nd_opt_type] & optflags) == 0) {
 			syslog(LOG_INFO, "<%s> unexpected ND option(type %d)",
 			    __func__, hdr->nd_opt_type);
 			continue;
+		}
 		/*
 @@ -1268,78 +1276,76 @@ nd6_options(struct nd_opt_hdr *hdr, int
+		{
 			struct nd_optlist *pfxlist;
 			if (ndopts->nd_opts_pi == 0) {
 				ndopts->nd_opts_pi =
 				    (struct nd_opt_prefix_info *)hdr;
 				continue;
+			}
 			if ((pfxlist = malloc(sizeof(*pfxlist))) == NULL) {
 				syslog(LOG_ERR, "<%s> can't allocate memory",
 				    __func__);
 				goto bad;
+			}
 			pfxlist->next = ndopts->nd_opts_list;
 			pfxlist->opt = hdr;
-			ndopts->nd_opts_list = pfxlist;
+			TAILQ_INSERT_TAIL(&ndopts->nd_opts_list, pfxlist, next);
 			break;
+		}
 		default:	/* impossible */
 			break;
+		}
+	}
 	return(0);
   bad:
 	free_ndopts(ndopts);
 	return(-1);
+}
 static void
 free_ndopts(union nd_opts *ndopts)
+{
-	struct nd_optlist *opt = ndopts->nd_opts_list, *next;
+	struct nd_optlist *opt;
-	while (opt) {
+	while ((opt = TAILQ_FIRST(&ndopts->nd_opts_list)) != NULL) {
-		next = opt->next;
+		TAILQ_REMOVE(&ndopts->nd_opts_list, opt, next);
 		free(opt);
 		opt = next;
+	}
+}
 void
-sock_open()
+sock_open(void)
+{
 	struct icmp6_filter filt;
 	struct ipv6_mreq mreq;
-	struct rainfo *ra = ralist;
+	struct rainfo *ra;
 	int on;
 	/* XXX: should be max MTU attached to the node */
-	static u_char answer[1500];
+	static unsigned char answer[1500];
 	rcvcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo)) +
 				CMSG_SPACE(sizeof(int));
-	rcvcmsgbuf = (u_char *)malloc(rcvcmsgbuflen);
+	rcvcmsgbuf = malloc(rcvcmsgbuflen);
 	if (rcvcmsgbuf == NULL) {
 		syslog(LOG_ERR, "<%s> not enough core", __func__);
 		exit(1);
+	}
 	sndcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo)) +
 				CMSG_SPACE(sizeof(int));
-	sndcmsgbuf = (u_char *)malloc(sndcmsgbuflen);
+	sndcmsgbuf = malloc(sndcmsgbuflen);
 	if (sndcmsgbuf == NULL) {
 		syslog(LOG_ERR, "<%s> not enough core", __func__);
 		exit(1);
+	}
 	if ((sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0) {
 		syslog(LOG_ERR, "<%s> socket: %s", __func__,
 		       strerror(errno));
 		exit(1);
+	}
 	/* specify to tell receiving interface */
 	on = 1;
 @@ -1383,139 +1389,138 @@ sock_open()
 	if (accept_rr)
 		ICMP6_FILTER_SETPASS(ICMP6_ROUTER_RENUMBERING, &filt);
 	if (setsockopt(sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt,
 		       sizeof(filt)) < 0) {
 		syslog(LOG_ERR, "<%s> IICMP6_FILTER: %s",
 		       __func__, strerror(errno));
 		exit(1);
+	}
 	/*
 	 * join all routers multicast address on each advertising interface.
 	 */
 	if (inet_pton(AF_INET6, ALLROUTERS_LINK,
-		      &mreq.ipv6mr_multiaddr.s6_addr)
+	    mreq.ipv6mr_multiaddr.s6_addr) != 1)
 	    != 1) {
 		syslog(LOG_ERR, "<%s> inet_pton failed(library bug?)",
-		       __func__);
+		    __func__);
 		exit(1);
+	}
-	while (ra) {
+	TAILQ_FOREACH(ra, &ralist, next) {
 		mreq.ipv6mr_interface = ra->ifindex;
 		if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq,
 			       sizeof(mreq)) < 0) {
 			syslog(LOG_ERR, "<%s> IPV6_JOIN_GROUP(link) on %s: %s",
 			       __func__, ra->ifname, strerror(errno));
 			exit(1);
+		}
 		ra = ra->next;
+	}
 	/*
 	 * When attending router renumbering, join all-routers site-local
 	 * multicast group.
 	 */
 	if (accept_rr) {
 		if (inet_pton(AF_INET6, ALLROUTERS_SITE,
-			      &in6a_site_allrouters) != 1) {
+		     mreq.ipv6mr_multiaddr.s6_addr) != 1)
+		{
 			syslog(LOG_ERR, "<%s> inet_pton failed(library bug?)",
-			       __func__);
+			    __func__);
 			exit(1);
+		}
-		mreq.ipv6mr_multiaddr = in6a_site_allrouters;
+		ra = TAILQ_FIRST(&ralist);
 		if (mcastif) {
 			if ((mreq.ipv6mr_interface = if_nametoindex(mcastif))
 			    == 0) {
 				syslog(LOG_ERR,
 				       "<%s> invalid interface: %s",
 				       __func__, mcastif);
 				exit(1);
+			}
 		} else
-			mreq.ipv6mr_interface = ralist->ifindex;
+			mreq.ipv6mr_interface = ra->ifindex;
 		if (setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP,
 			       &mreq, sizeof(mreq)) < 0) {
 			syslog(LOG_ERR,
 			       "<%s> IPV6_JOIN_GROUP(site) on %s: %s",
 			       __func__,
-			       mcastif ? mcastif : ralist->ifname,
+			       mcastif ? mcastif : ra->ifname,
 			       strerror(errno));
 			exit(1);
+		}
+	}
 	/* initialize msghdr for receiving packets */
-	rcviov[0].iov_base = (caddr_t)answer;
+	rcviov[0].iov_base = answer;
 	rcviov[0].iov_len = sizeof(answer);
-	rcvmhdr.msg_name = (caddr_t)&rcvfrom;
+	rcvmhdr.msg_name = &rcvfrom;
 	rcvmhdr.msg_namelen = sizeof(rcvfrom);
 	rcvmhdr.msg_iov = rcviov;
 	rcvmhdr.msg_iovlen = 1;
-	rcvmhdr.msg_control = (caddr_t) rcvcmsgbuf;
+	rcvmhdr.msg_control = rcvcmsgbuf;
 	rcvmhdr.msg_controllen = rcvcmsgbuflen;
 	/* initialize msghdr for sending packets */
 	sndmhdr.msg_namelen = sizeof(struct sockaddr_in6);
 	sndmhdr.msg_iov = sndiov;
 	sndmhdr.msg_iovlen = 1;
-	sndmhdr.msg_control = (caddr_t)sndcmsgbuf;
+	sndmhdr.msg_control = (void *)sndcmsgbuf;
 	sndmhdr.msg_controllen = sndcmsgbuflen;
 	return;
+}
 /* open a routing socket to watch the routing table */
 static void
-rtsock_open()
+rtsock_open(void)
+{
 	if ((rtsock = socket(PF_ROUTE, SOCK_RAW, 0)) < 0) {
 		syslog(LOG_ERR,
 		       "<%s> socket: %s", __func__, strerror(errno));
 		exit(1);
+	}
+}
 struct rainfo *
-if_indextorainfo(int idx)
+if_indextorainfo(unsigned int idx)
+{
-	struct rainfo *rai = ralist;
+	struct rainfo *rai;
-	for (rai = ralist; rai; rai = rai->next) {
+	TAILQ_FOREACH(rai, &ralist, next) {
 		if (rai->ifindex == idx)
 			return(rai);
+	}
 	return(NULL);		/* search failed */
+}
 static void
-ra_output(rainfo)
+ra_output(struct rainfo *rainfo)
 struct rainfo *rainfo;
+{
 	int i;
 	struct cmsghdr *cm;
 	struct in6_pktinfo *pi;
-	struct soliciter *sol, *nextsol;
+	struct soliciter *sol;
 	if ((iflist[rainfo->ifindex]->ifm_flags & IFF_UP) == 0) {
 		syslog(LOG_DEBUG, "<%s> %s is not up, skip sending RA",
 		       __func__, rainfo->ifname);
 		return;
+	}
 	make_packet(rainfo);	/* XXX: inefficient */
-	sndmhdr.msg_name = (caddr_t)&sin6_allnodes;
+	sndmhdr.msg_name = (void *)&sin6_linklocal_allnodes;
-	sndmhdr.msg_iov[0].iov_base = (caddr_t)rainfo->ra_data;
+	sndmhdr.msg_iov[0].iov_base = (void *)rainfo->ra_data;
 	sndmhdr.msg_iov[0].iov_len = rainfo->ra_datalen;
 	cm = CMSG_FIRSTHDR(&sndmhdr);
 	/* specify the outgoing interface */
 	cm->cmsg_level = IPPROTO_IPV6;
 	cm->cmsg_type = IPV6_PKTINFO;
 	cm->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
 	pi = (struct in6_pktinfo *)CMSG_DATA(cm);
 	memset(&pi->ipi6_addr, 0, sizeof(pi->ipi6_addr));	/*XXX*/
 	pi->ipi6_ifindex = rainfo->ifindex;
 	/* specify the hop limit of the packet */
+	{
 @@ -1524,59 +1529,55 @@ struct rainfo *rainfo;
 		cm = CMSG_NXTHDR(&sndmhdr, cm);
 		cm->cmsg_level = IPPROTO_IPV6;
 		cm->cmsg_type = IPV6_HOPLIMIT;
 		cm->cmsg_len = CMSG_LEN(sizeof(int));
 		memcpy(CMSG_DATA(cm), &hoplimit, sizeof(int));
+	}
 	syslog(LOG_DEBUG,
 	       "<%s> send RA on %s, # of waitings = %d",
 	       __func__, rainfo->ifname, rainfo->waiting);
 	i = sendmsg(sock, &sndmhdr, 0);
-	if (i < 0 || i != rainfo->ra_datalen)  {
+	if (i < 0 || (size_t)i != rainfo->ra_datalen)  {
 		if (i < 0) {
 			syslog(LOG_ERR, "<%s> sendmsg on %s: %s",
 			       __func__, rainfo->ifname,
 			       strerror(errno));
+		}
+	}
 	/*
 	 * unicast advertisements
 	 * XXX commented out.  reason: though spec does not forbit it, unicast
 	 * advert does not really help
 	 */
-	for (sol = rainfo->soliciter; sol; sol = nextsol) {
+	while ((sol = TAILQ_FIRST(&rainfo->soliciter)) != NULL) {
 		nextsol = sol->next;
 #if 0
-		sndmhdr.msg_name = (caddr_t)&sol->addr;
+		sndmhdr.msg_name = (void *)&sol->addr;
 		i = sendmsg(sock, &sndmhdr, 0);
 		if (i < 0 || i != rainfo->ra_datalen)  {
 			if (i < 0) {
 				syslog(LOG_ERR,
 				    "<%s> unicast sendmsg on %s: %s",
 				    __func__, rainfo->ifname,
 				    strerror(errno));
+			}
+		}
 #endif
 		TAILQ_REMOVE(&rainfo->soliciter, sol, next);
 		sol->next = NULL;
 		free(sol);
+	}
 	rainfo->soliciter = NULL;
 	/* update counter */
 	if (rainfo->initcounter < MAX_INITIAL_RTR_ADVERTISEMENTS)
 		rainfo->initcounter++;
 	rainfo->raoutput++;
 	/* update timestamp */
 	gettimeofday(&rainfo->lastsent, NULL);
 	/* reset waiting conter */
 	rainfo->waiting = 0;
+}

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: rtadvd.conf.5,v 1.14 2009/11/01 15:19:19 jakllsch Exp $
+.\"	$NetBSD: rtadvd.conf.5,v 1.15 2011/12/10 19:14:29 roy Exp $
 .\"	$KAME: rtadvd.conf.5,v 1.50 2005/01/14 05:30:59 jinmei Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 @@ -18,27 +18,27 @@
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd November 1, 2009
+.Dd December 7, 2012
 .Dt RTADVD.CONF 5
 .Os
 .Sh NAME
 .Nm rtadvd.conf
 .Nd config file for router advertisement daemon
 .Sh DESCRIPTION
 This file describes how the router advertisement packets must be constructed
 for each of the interfaces.
 .Pp
 As described in
 .Xr rtadvd 8 ,
 you do not have to set this configuration file up at all,
 unless you need some special configurations.
 @@ -323,26 +323,86 @@ old version of the program.
 In the above list, each keyword beginning with
 .Dq Li rt
 could be replaced with the one beginning with
 .Dq Li rtr
 for backward compatibility reason.
 For example,
 .Cm rtrplen
 is accepted instead of
 .Cm rtplen .
 However, keywords that start with
 .Dq Li rtr
 have basically been obsoleted, and should not be used any more.
 .Pp
 The following items are for ICMPv6 Recursive DNS Server Option and
 DNS Search List Option
 .Pq RFC 6106 ,
 which will be attached to router advertisement header.
 These items are optional.
 .Bl -tag -width indent
 .It Cm \&rdnss
 (str) The IPv6 address of one or more recursive DNS servers.
 The argument must be inside double quotes.
 Multiple DNS servers can be specified in a comma-separated string.
 If different lifetimes are needed for different servers,
 separate entries can be given by using
 .Cm rdnss ,
 .Cm rdnss0 ,
 .Cm rdnss1 ,
 .Cm rdnss2 ...
 options with corresponding
 .Cm rdnssltime ,
 .Cm rdnssltime0 ,
 .Cm rdnssltime1 ,
 .Cm rdnssltime2 ...
 entries.
 Note that the maximum number of servers depends on the receiver side.
 See also
 .Xr resolver 5
 manual page for resolver implementation in
 .Fx .
 .It Cm \&rdnssltime
 The lifetime of the
 .Cm rdnss
 DNS server entries.
 The default value is 3/2 of the interval time.
 .It Cm \&dnssl
 (str) One or more domain names in a comma-separated string.
 These domain names will be used when making DNS queries on a
 non-fully-qualified domain name.
 If different lifetimes are needed for different domains, separate entries
 can be given by using
 .Cm dnssl ,
 .Cm dnssl0 ,
 .Cm dnssl1 ,
 .Cm dnssl2 ...
 options with corresponding
 .Cm dnsslltime ,
 .Cm dnsslltime0 ,
 .Cm dnsslltime1 ,
 .Cm dnsslltime2 ...
 entries.
 Note that the maximum number of names depends on the receiver side.
 See also
 .Xr resolver 5
 manual page for resolver implementation in
 .Fx .
 .It Cm \&dnsslltime
 The lifetime of the
 .Cm dnssl
 DNS search list entries.
 The default value is 3/2 of the interval time.
 .El
 .Pp
 You can also refer one line from another by using
 .Cm tc
 capability.
 See
 .Xr termcap 5
 for details on the capability.
 .Sh EXAMPLES
 As presented above, all of the advertised parameters have default values
 defined in specifications, and hence you usually do not have to set them
 by hand, unless you need special non-default values.
 It can cause interoperability problem if you use an ill-configured
 parameter.
 .Pp
 @@ -359,47 +419,64 @@ ne0:\\
 .Pp
 The following example manually configures prefixes advertised from the
 .Li ef0
 interface.
 The configuration must be used with the
 .Fl s
 option to
 .Xr rtadvd 8 .
 .Bd -literal
 ef0:\\
 	:addr="2001:db8:ffff:1000::":prefixlen#64:
 .Ed
 .Pp
 The following example configures the
 .Li wlan0
 interface and adds two DNS servers and a DNS domain search options
 using the default option lifetime values.
 .Bd -literal -offset
 wlan0:\\
 	:addr="2001:db8:ffff:1000::":prefixlen#64:\\
 	:rdnss="2001:db8:ffff::10,2001:db8:ffff::2:43":\\
 	:dnssl="example.com":
 .Ed
 .Pp
 The following example presents the default values in an explicit manner.
 The configuration is provided just for reference purposes;
 YOU DO NOT NEED TO HAVE IT AT ALL.
 .Bd -literal
 default:\\
 	:chlim#64:raflags#0:rltime#1800:rtime#0:retrans#0:\\
 	:pinfoflags="la":vltime#2592000:pltime#604800:mtu#0:
 ef0:\\
 	:addr="2001:db8:ffff:1000::":prefixlen#64:tc=default:
 .Ed
 .Sh SEE ALSO
 .Xr termcap 5 ,
 .Xr rtadvd 8 ,
 .Xr rtsol 8
 .Pp
 Thomas Narten, Erik Nordmark and W. A. Simpson,
 .Do
 Neighbor Discovery for IP version 6 (IPv6)
 .Dc ,
 RFC 2461
 .Pp
 Richard Draves,
 .Do
 Default Router Preferences and More-Specific Routes
 .Dc ,
 RFC 4191
 .Pp
 J. Jeong, S. Park, L. Beloeil, S. Madanapalli
 .Do
 IPv6 Router Advertisement Options for DNS Configuration
 .Dc ,
 RFC 6106
 .Sh HISTORY
 The
 .Xr rtadvd 8
 and the configuration file
 .Nm
 first appeared in WIDE Hydrangea IPv6 protocol stack kit.
 .\" .Sh BUGS
 .\" (to be written)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtadvd.h,v 1.10 2006/03/05 23:47:08 rpaulo Exp $	*/
+/*	$NetBSD: rtadvd.h,v 1.11 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: rtadvd.h,v 1.30 2005/10/17 14:40:02 suz Exp $	*/
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -23,28 +23,34 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #define ALLNODES "ff02::1"
 #define ALLROUTERS_LINK "ff02::2"
 #define ALLROUTERS_SITE "ff05::2"
 #define ANY "::"
-#define RTSOLLEN 8
+#define IN6ADDR_SITELOCAL_ALLROUTERS_INIT \
 	{{{ 0xff, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
 x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 }}}
 //extern struct sockaddr_in6 sin6_linklocal_allnodes;
 //extern struct sockaddr_in6 sin6_linklocal_allrouters;
 extern struct sockaddr_in6 sin6_sitelocal_allrouters;
 /* protocol constants and default values */
 #define DEF_MAXRTRADVINTERVAL 600
 #define DEF_ADVLINKMTU 0
 #define DEF_ADVREACHABLETIME 0
 #define DEF_ADVRETRANSTIMER 0
 #define DEF_ADVCURHOPLIMIT 64
 #define DEF_ADVVALIDLIFETIME 2592000
 #define DEF_ADVPREFERREDLIFETIME 604800
 #define MAXROUTERLIFETIME 9000
 #define MIN_MAXINTERVAL 4
 #define MAX_MAXINTERVAL 1800
 @@ -52,110 +58,132 @@
 #define MAXREACHABLETIME 3600000
 #define MAX_INITIAL_RTR_ADVERT_INTERVAL  16
 #define MAX_INITIAL_RTR_ADVERTISEMENTS    3
 #define MAX_FINAL_RTR_ADVERTISEMENTS      3
 #define MIN_DELAY_BETWEEN_RAS             3
 #define MAX_RA_DELAY_TIME                 500000 /* usec */
 #define PREFIX_FROM_KERNEL 1
 #define PREFIX_FROM_CONFIG 2
 #define PREFIX_FROM_DYNAMIC 3
 struct prefix {
-	struct prefix *next;	/* forward link */
+	TAILQ_ENTRY(prefix) next;
 	struct prefix *prev;	/* previous link */
 	struct rainfo *rainfo;	/* back pointer to the interface */
 	struct rtadvd_timer *timer; /* expiration timer.  used when a prefix
 				     * derived from the kernel is deleted.
 				     */
-	u_int32_t validlifetime; /* AdvValidLifetime */
+	uint32_t validlifetime; /* AdvValidLifetime */
 	long	vltimeexpire;	/* expiration of vltime; decrement case only */
-	u_int32_t preflifetime;	/* AdvPreferredLifetime */
+	uint32_t preflifetime;	/* AdvPreferredLifetime */
 	long	pltimeexpire;	/* expiration of pltime; decrement case only */
-	u_int onlinkflg;	/* bool: AdvOnLinkFlag */
+	uint16_t onlinkflg;	/* bool: AdvOnLinkFlag */
-	u_int autoconfflg;	/* bool: AdvAutonomousFlag */
+	uint16_t autoconfflg;	/* bool: AdvAutonomousFlag */
 	int prefixlen;
 	int origin;		/* from kernel or config */
 	struct in6_addr prefix;
 };
 #ifdef ROUTEINFO
 struct rtinfo {
-	struct rtinfo *prev;	/* previous link */
+	TAILQ_ENTRY(rtinfo) next;
 	struct rtinfo *next;	/* forward link */
-	u_int32_t ltime;	/* route lifetime */
+	uint32_t ltime;	/* route lifetime */
-	u_int rtpref;		/* route preference */
+	uint16_t rtpref;		/* route preference */
 	int prefixlen;
 	struct in6_addr prefix;
 };
 #endif
 struct rdnss_addr {
 	TAILQ_ENTRY(rdnss_addr) next;
 	struct in6_addr addr;
 };
 struct rdnss {
 	TAILQ_ENTRY(rdnss) next;
 	TAILQ_HEAD(, rdnss_addr) list;
 	uint32_t lifetime;
 };
 struct dnssl_domain {
 	TAILQ_ENTRY(dnssl_domain) next;
 	int len;
 	char domain[256];
 };
 struct dnssl {
 	TAILQ_ENTRY(dnssl) next;
 	TAILQ_HEAD(, dnssl_domain) list;
 	uint32_t lifetime;
 };
 struct soliciter {
-	struct soliciter *next;
+	TAILQ_ENTRY(soliciter) next;
 	struct sockaddr_in6 addr;
 };
 struct	rainfo {
-	/* pointer for list */
+	TAILQ_ENTRY(rainfo) next;
 	struct	rainfo *next;
 	/* timer related parameters */
 	struct rtadvd_timer *timer;
 	int initcounter; /* counter for the first few advertisements */
 	struct timeval lastsent; /* timestamp when the latest RA was sent */
 	int waiting;		/* number of RS waiting for RA */
 	/* interface information */
-	int	ifindex;
+	uint16_t	ifindex;
 	int	advlinkopt;	/* bool: whether include link-layer addr opt */
 	struct sockaddr_dl *sdl;
 	char	ifname[16];
-	int	phymtu;		/* mtu of the physical interface */
+	uint32_t	phymtu;		/* mtu of the physical interface */
 	/* Router configuration variables */
-	u_short lifetime;	/* AdvDefaultLifetime */
+	uint16_t	lifetime;	/* AdvDefaultLifetime */
-	u_int	maxinterval;	/* MaxRtrAdvInterval */
+	uint16_t	maxinterval;	/* MaxRtrAdvInterval */
-	u_int	mininterval;	/* MinRtrAdvInterval */
+	uint16_t	mininterval;	/* MinRtrAdvInterval */
 	int 	managedflg;	/* AdvManagedFlag */
 	int	otherflg;	/* AdvOtherConfigFlag */
 	int	rtpref;		/* router preference */
-	u_int32_t linkmtu;	/* AdvLinkMTU */
+	uint32_t linkmtu;	/* AdvLinkMTU */
-	u_int32_t reachabletime; /* AdvReachableTime */
+	uint32_t reachabletime; /* AdvReachableTime */
-	u_int32_t retranstimer;	/* AdvRetransTimer */
+	uint32_t retranstimer;	/* AdvRetransTimer */
-	u_int	hoplimit;	/* AdvCurHopLimit */
+	uint16_t	hoplimit;	/* AdvCurHopLimit */
-	struct prefix prefix;	/* AdvPrefixList(link head) */
+	TAILQ_HEAD(, prefix) prefix;	/* AdvPrefixList(link head) */
-	int	pfxs;		/* number of prefixes */
+	int	pfxs;
-	long	clockskew;	/* used for consisitency check of lifetimes */
+	uint16_t	clockskew;/* used for consisitency check of lifetimes */
-#ifdef ROUTEINFO
+	TAILQ_HEAD(, rtinfo) route;
-	struct rtinfo route;	/* route information option (link head) */
+	TAILQ_HEAD(, rdnss) rdnss;	/* RDNSS list */
-	int	routes;		/* number of route information options */
+	TAILQ_HEAD(, dnssl) dnssl;	/* DNS Search List */
 #endif
 	/* actual RA packet data and its length */
 	size_t ra_datalen;
-	u_char *ra_data;
+	char *ra_data;
 	/* statistics */
-	u_quad_t raoutput;	/* number of RAs sent */
+	uint64_t raoutput;	/* number of RAs sent */
-	u_quad_t rainput;	/* number of RAs received */
+	uint64_t rainput;	/* number of RAs received */
-	u_quad_t rainconsistent; /* number of RAs inconsistent with ours */
+	uint64_t rainconsistent; /* number of RAs inconsistent with ours */
-	u_quad_t rsinput;	/* number of RSs received */
+	uint64_t rsinput;	/* number of RSs received */
 	/* info about soliciter */
-	struct soliciter *soliciter;	/* recent solication source */
+	TAILQ_HEAD(, soliciter) soliciter;	/* recent solication source */
 };
-struct rtadvd_timer *ra_timeout __P((void *));
+extern TAILQ_HEAD(ralist_head_t, rainfo) ralist;
 void ra_timer_update __P((void *, struct timeval *));
-int prefix_match __P((struct in6_addr *, int, struct in6_addr *, int));
+struct rtadvd_timer *ra_timeout(void *);
-struct rainfo *if_indextorainfo __P((int));
+void ra_timer_update(void *, struct timeval *);
 struct prefix *find_prefix __P((struct rainfo *, struct in6_addr *, int));
-extern struct in6_addr in6a_site_allrouters;
+int prefix_match(struct in6_addr *, int, struct in6_addr *, int);
 struct rainfo *if_indextorainfo(unsigned int);
 struct prefix *find_prefix(struct rainfo *, struct in6_addr *, int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: timer.c,v 1.9 2006/03/05 23:47:08 rpaulo Exp $	*/
+/*	$NetBSD: timer.c,v 1.10 2011/12/10 19:14:29 roy Exp $	*/
 /*	$KAME: timer.c,v 1.11 2005/04/14 06:22:35 suz Exp $	*/
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -20,148 +20,147 @@
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/queue.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
 #include <search.h>
 #include "timer.h"
-static struct rtadvd_timer timer_head;
+struct rtadvd_timer_head_t ra_timer = TAILQ_HEAD_INITIALIZER(ra_timer);
 #define MILLION 1000000
 #define TIMEVAL_EQUAL(t1,t2) ((t1)->tv_sec == (t2)->tv_sec &&\
  (t1)->tv_usec == (t2)->tv_usec)
-static struct timeval tm_max = {0x7fffffff, 0x7fffffff};
+static struct timeval tm_limit = {0x7fffffff, 0x7fffffff};
 static struct timeval tm_max;
 void
-rtadvd_timer_init()
+rtadvd_timer_init(void)
+{
 	memset(&timer_head, 0, sizeof(timer_head));
-	timer_head.next = timer_head.prev = &timer_head;
+	TAILQ_INIT(&ra_timer);
-	timer_head.tm = tm_max;
+	tm_max = tm_limit;
+}
 struct rtadvd_timer *
-rtadvd_add_timer(struct rtadvd_timer *(*timeout) __P((void *)),
+rtadvd_add_timer(struct rtadvd_timer *(*timeout) (void *),
-    void (*update) __P((void *, struct timeval *)),
+    void (*update) (void *, struct timeval *),
     void *timeodata, void *updatedata)
+{
 	struct rtadvd_timer *newtimer;
 	if ((newtimer = malloc(sizeof(*newtimer))) == NULL) {
 		syslog(LOG_ERR,
 		       "<%s> can't allocate memory", __func__);
 		exit(1);
+	}
 	memset(newtimer, 0, sizeof(*newtimer));
 	if (timeout == NULL) {
 		syslog(LOG_ERR,
 		       "<%s> timeout function unspecified", __func__);
 		exit(1);
+	}
 	newtimer->expire = timeout;
 	newtimer->update = update;
 	newtimer->expire_data = timeodata;
 	newtimer->update_data = updatedata;
 	newtimer->tm = tm_max;
 	/* link into chain */
-	insque(newtimer, &timer_head);
+	TAILQ_INSERT_TAIL(&ra_timer, newtimer, next);
 	return(newtimer);
+}
 void
 rtadvd_remove_timer(struct rtadvd_timer **timer)
+{
 	remque(*timer);
 	TAILQ_REMOVE(&ra_timer, *timer, next);
 	free(*timer);
 	*timer = NULL;
+}
 void
 rtadvd_set_timer(struct timeval *tm, struct rtadvd_timer *timer)
+{
 	struct timeval now;
 	/* reset the timer */
 	gettimeofday(&now, NULL);
 	TIMEVAL_ADD(&now, tm, &timer->tm);
 	/* update the next expiration time */
-	if (TIMEVAL_LT(timer->tm, timer_head.tm))
+	if (TIMEVAL_LT(timer->tm, tm_max))
-		timer_head.tm = timer->tm;
+		tm_max = timer->tm;
 	return;
+}
 /*
  * Check expiration for each timer. If a timer expires,
  * call the expire function for the timer and update the timer.
  * Return the next interval for select() call.
  */
 struct timeval *
-rtadvd_check_timer()
+rtadvd_check_timer(void)
+{
 	static struct timeval returnval;
 	struct timeval now;
-	struct rtadvd_timer *tm = timer_head.next, *tm_next;
+	struct rtadvd_timer *tm;
 	gettimeofday(&now, NULL);
 	tm_max = tm_limit;
-	timer_head.tm = tm_max;
+	TAILQ_FOREACH(tm, &ra_timer, next) {
 	for (tm = timer_head.next; tm != &timer_head; tm = tm_next) {
 		tm_next = tm->next;
 		if (TIMEVAL_LEQ(tm->tm, now)) {
 			if ((*tm->expire)(tm->expire_data) == NULL)
 				continue; /* the timer was removed */
 			if (tm->update)
 				(*tm->update)(tm->update_data, &tm->tm);
 			TIMEVAL_ADD(&tm->tm, &now, &tm->tm);
+		}
-		if (TIMEVAL_LT(tm->tm, timer_head.tm))
+		if (TIMEVAL_LT(tm->tm, tm_max))
-			timer_head.tm = tm->tm;
+			tm_max = tm->tm;
+	}
-	if (TIMEVAL_EQUAL(&tm_max, &timer_head.tm)) {
+	if (TIMEVAL_EQUAL(&tm_max, &tm_limit)) {
 		/* no need to timeout */
 		return(NULL);
-	} else if (TIMEVAL_LT(timer_head.tm, now)) {
+	} else if (TIMEVAL_LT(tm_max, now)) {
 		/* this may occur when the interval is too small */
 		returnval.tv_sec = returnval.tv_usec = 0;
 	} else
-		TIMEVAL_SUB(&timer_head.tm, &now, &returnval);
+		TIMEVAL_SUB(&tm_max, &now, &returnval);
 	return(&returnval);
+}
 struct timeval *
 rtadvd_timer_rest(struct rtadvd_timer *timer)
+{
 	static struct timeval returnval, now;
 	gettimeofday(&now, NULL);
 	if (TIMEVAL_LEQ(timer->tm, now)) {
 		syslog(LOG_DEBUG,
 		       "<%s> a timer must be expired, but not yet",
 		       __func__);