 @@ -1,14 +1,14 @@
-/*	$NetBSD: config.c,v 1.26 2011/12/10 19:14:29 roy Exp $	*/
+/*	$NetBSD: config.c,v 1.27 2011/12/11 20:44:44 christos 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
 @@ -82,28 +82,27 @@ encode_domain(char *dst, const char *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)
+getconfig(const char *intface)
 	char *intface;
+{
 	int stat, c, i;
 	char tbuf[BUFSIZ];
 	struct rainfo *tmp;
 	int32_t val;
 	int64_t val64;
 	char buf[BUFSIZ];
 	char *bp = buf;
 	char *addr, *flagstr, *ap;
 	static int forwarding = -1;
 	char entbuf[256], abuf[256];
 #define MUSTHAVE(var, cap)	\
 @@ -113,47 +112,45 @@ getconfig(intface)
 		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));					\
+		p = calloc(1, sizeof(*p));				\
 		if (p == NULL) {					\
-			syslog(LOG_ERR, "<%s> malloc failed: %s",	\
+			syslog(LOG_ERR, "<%s> calloc failed: %m",	\
-			    __func__, strerror(errno));			\
+			    __func__);					\
 			error_action;					\
 		}							\
-		memset(p, 0, sizeof(*p));				\
+	} while(/*CONSTCOND*/0)
 	} 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);
+	}
 	ELM_MALLOC(tmp, exit(1));
 	memset(tmp, 0, sizeof(*tmp));
 	/* 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) {
 @@ -294,33 +291,32 @@ getconfig(intface)
 	tmp->clockskew = val;
 	tmp->pfxs++;
 	TAILQ_INIT(&tmp->prefix);
 	for (i = -1; i < MAXPREFIX; i++) {
 		struct prefix *pfx;
 		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) {
+		if ((pfx = calloc(1, sizeof(*pfx))) == NULL) {
 			syslog(LOG_ERR,
-			       "<%s> can't allocate enough memory",
+			       "<%s> can't allocate memory: %m",
 			       __func__);
 			exit(1);
+		}
 		memset(pfx, 0, sizeof(*pfx));
 		TAILQ_INSERT_TAIL(&tmp->prefix, pfx, next);
 		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);
+		}
 @@ -423,44 +419,43 @@ getconfig(intface)
 		       "<%s> advertised link mtu (%d) on %s is invalid (must "
 		       "be between least MTU (%d) and physical link MTU (%d)",
 		       __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__,
+			syslog(LOG_ERR, "<%s> socket: %m", __func__);
 			       strerror(errno));
 			exit(1);
+		}
 		memset(&ndi, 0, sizeof(ndi));
 		strncpy(ndi.ifname, intface, IFNAMSIZ);
 		if (ioctl(s, SIOCGIFINFO_IN6, &ndi) < 0) {
-			syslog(LOG_INFO, "<%s> ioctl:SIOCGIFINFO_IN6 at %s: %s",
+			syslog(LOG_INFO, "<%s> ioctl:SIOCGIFINFO_IN6 at %s: %m",
-			     __func__, intface, strerror(errno));
+			     __func__, intface);
+		}
 		/* 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, &ndi) < 0) {
-			syslog(LOG_INFO, "<%s> ioctl:SIOCSIFINFO_IN6 at %s: %s",
+			syslog(LOG_INFO, "<%s> ioctl:SIOCSIFINFO_IN6 at %s: %m",
-			     __func__, intface, strerror(errno));
+			     __func__, intface);
+		}
 		close(s);
+	}
 #endif
 	/* route information */
 	TAILQ_INIT(&tmp->route);
 	for (i = -1; i < MAXROUTE; i++) {
 		struct rtinfo *rti;
 		char oentbuf[256];
 		makeentry(entbuf, sizeof(entbuf), i, "rtprefix");
 		addr = (char *)agetstr(entbuf, &bp);
 @@ -720,33 +715,32 @@ get_prefix(struct rainfo *rai)
 			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;
+		}
 		/* allocate memory to store prefix info. */
-		if ((pp = malloc(sizeof(*pp))) == NULL) {
+		if ((pp = calloc(1, 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 = (unsigned char *)&pp->prefix;
 			ep = (unsigned char *)(&pp->prefix + 1);
 			while (m < lim && p < ep)
 				*p++ &= *m++;
 			while (p < ep)
 				*p++ = 0x00;
+		}
 @@ -787,32 +781,31 @@ makeentry(char *buf, size_t len, int 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
  * able to be specified.
  */
 static void
 add_prefix(struct rainfo *rai, struct in6_prefixreq *ipr)
+{
 	struct prefix *prefix;
 	char ntopbuf[INET6_ADDRSTRLEN];
-	if ((prefix = malloc(sizeof(*prefix))) == NULL) {
+	if ((prefix = calloc(1, sizeof(*prefix))) == NULL) {
 		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;
 	prefix->rainfo = rai;
 	TAILQ_INSERT_TAIL(&rai->prefix, prefix, next);
 	rai->pfxs++;
 	syslog(LOG_DEBUG, "<%s> new prefix %s/%d was added on %s",
 @@ -914,34 +907,32 @@ update_prefix(struct prefix * prefix)
 /*
  * Try to get an in6_prefixreq contents for a prefix which matches
  * ipr->ipr_prefix and ipr->ipr_plen and belongs to
  * the interface whose name is ipr->ipr_name[].
  */
 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__,
+		syslog(LOG_ERR, "<%s> socket: %m", __func__);
 		       strerror(errno));
 		exit(1);
+	}
 	if (ioctl(s, SIOCGIFPREFIX_IN6, ipr) < 0) {
-		syslog(LOG_INFO, "<%s> ioctl:SIOCGIFPREFIX %s", __func__,
+		syslog(LOG_INFO, "<%s> ioctl:SIOCGIFPREFIX: %m", __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"
 		       "lower than PR_ORIG_RR(router renumbering)."
 		       "This should not happen if I am router", __func__,
 @@ -960,28 +951,28 @@ init_prefix(struct in6_prefixreq *ipr)
 	ipr->ipr_raf_auto = 1;
 	return 0;
 #endif
+}
 void
 make_prefix(struct rainfo *rai, int ifindex, struct in6_addr *addr, int plen)
+{
 	struct in6_prefixreq ipr;
 	memset(&ipr, 0, sizeof(ipr));
 	if (if_indextoname(ifindex, ipr.ipr_name) == NULL) {
 		syslog(LOG_ERR, "<%s> Prefix added interface No.%d doesn't"
-		       "exist. This should not happen! %s", __func__,
+		       "exist. This should not happen: %m", __func__,
-		       ifindex, strerror(errno));
+		       ifindex);
 		exit(1);
+	}
 	ipr.ipr_prefix.sin6_len = sizeof(ipr.ipr_prefix);
 	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
 @@ -1028,82 +1019,89 @@ make_packet(struct rainfo *rainfo)
 		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) {
+	if ((buf = realloc(rainfo->ra_data, packlen)) == NULL) {
 		syslog(LOG_ERR,
-		       "<%s> can't get enough memory for an RA packet",
+		       "<%s> can't get enough memory for an RA packet %m",
 		       __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;
 #define CHECKLEN(size) \
 	do { \
 		if (buf + size > rainfo->ra_data + packlen) { \
 			syslog(LOG_ERR, \
 			    "<%s, %d> RA packet does not fit in %zu",\
 			    __func__, __LINE__, packlen); \
 			exit(1); \
 		} \
 	} while (/*CONSTCOND*/0)
 	/*
 	 * construct the packet
 	 */
 	CHECKLEN(sizeof(*ra));
 	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 = (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);
 	buf += sizeof(*ra);
 	if (rainfo->advlinkopt) {
 		CHECKLEN(sizeof(struct nd_opt_hdr));
 		lladdropt_fill(rainfo->sdl, (struct nd_opt_hdr *)buf);
 		buf += lladdroptlen;
+	}
 	if (rainfo->linkmtu) {
 		CHECKLEN(sizeof(*ndopt_mtu));
 		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;
 		struct timeval now;
 		CHECKLEN(sizeof(*ndopt_pi));
 		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;
 		if (pfx->timer)
 			vltime = 0;
 @@ -1133,78 +1131,84 @@ make_packet(struct rainfo *rainfo)
 			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);
+	}
 	TAILQ_FOREACH(rti, &rainfo->route, next) {
 		uint8_t psize = (rti->prefixlen + 0x3f) >> 6;
 		CHECKLEN(sizeof(*ndopt_rti));
 		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;
+	}
 	TAILQ_FOREACH(rdns, &rainfo->rdnss, next) {
 		CHECKLEN(sizeof(*ndopt_rdnss));
 		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) {
 			CHECKLEN(sizeof(rdnsa->addr));
 			memcpy(buf, &rdnsa->addr, sizeof(rdnsa->addr));
 			ndopt_rdnss->nd_opt_rdnss_len += 2;
 			buf += sizeof(rdnsa->addr);
+		}
+	}
 	TAILQ_FOREACH(dnsl, &rainfo->dnssl, next) {
 		CHECKLEN(sizeof(*ndopt_dnssl));
 		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) {
 			CHECKLEN(dnsd->len);
 			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;
 		CHECKLEN(plen);
 		memset(buf, 0, plen);
 		buf += plen;
 		ndopt_dnssl->nd_opt_dnssl_len = (len + plen) / 8;
+	}
 	memset(buf, 0, packlen - (buf - rainfo->ra_data));
+}
 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)
+	if (sysctl(mib, __arraycount(mib), &value, &size, NULL, 0)
 	    < 0) {
-		syslog(LOG_ERR, "<%s>: failed to get ip6 sysctl(%d): %s",
+		syslog(LOG_ERR, "<%s>: failed to get ip6 sysctl(%d): %m",
-		       __func__, code,
+		       __func__, code);
-		       strerror(errno));
+		return -1;
 		return(-1);
+	}
 	else
-		return(value);
+		return value;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: config.h,v 1.7 2011/12/10 19:14:29 roy Exp $	*/
+/*	$NetBSD: config.h,v 1.8 2011/12/11 20:44:44 christos 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,27 +20,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.
  */
-extern void getconfig(char *);
+extern void getconfig(const char *);
 extern void delete_prefix(struct prefix *);
 extern void invalidate_prefix(struct prefix *);
 extern void update_prefix(struct prefix *);
 extern void make_prefix(struct rainfo *, int, struct in6_addr *, int);
 extern void make_packet(struct rainfo *);
 extern void get_prefix(struct rainfo *);
 /*
  * it is highly unlikely to have 100 information options,
  * so it should be okay to limit it
  */
 #define MAXPREFIX	100
 #define MAXROUTE	100

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if.c,v 1.19 2011/12/10 19:14:29 roy Exp $	*/
+/*	$NetBSD: if.c,v 1.20 2011/12/11 20:44:44 christos 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
 @@ -73,27 +73,27 @@ get_rtaddrs(int addrs, struct sockaddr *
 	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;
+	}
+}
 struct sockaddr_dl *
-if_nametosdl(char *name)
+if_nametosdl(const char *name)
+{
 	struct ifaddrs *ifap, *ifa;
 	struct sockaddr_dl *sdl;
 	if (getifaddrs(&ifap) != 0)
 		return (NULL);
 	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
 		if (strcmp(ifa->ifa_name, name) != 0)
 			continue;
 		if (ifa->ifa_addr->sa_family != AF_LINK)
 			continue;
 @@ -101,27 +101,27 @@ if_nametosdl(char *name)
 		if (!sdl)
 			continue;	/*XXX*/
 		memcpy(sdl, ifa->ifa_addr, ifa->ifa_addr->sa_len);
 		freeifaddrs(ifap);
 		return (sdl);
+	}
 	freeifaddrs(ifap);
 	return (NULL);
+}
 int
-if_getmtu(char *name)
+if_getmtu(const char *name)
+{
 	struct ifaddrs *ifap, *ifa;
 	struct if_data *ifd;
 	u_long mtu = 0;
 	if (getifaddrs(&ifap) < 0)
 		return(0);
 	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
 		if (strcmp(ifa->ifa_name, name) == 0) {
 			ifd = ifa->ifa_data;
 			if (ifd)
 				mtu = ifd->ifi_mtu;
 			break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if.h,v 1.8 2011/12/10 19:14:29 roy Exp $	*/
+/*	$NetBSD: if.h,v 1.9 2011/12/11 20:44:44 christos 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,28 +27,28 @@
  * 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(char *);
+struct sockaddr_dl *if_nametosdl(const char *);
-int if_getmtu(char *);
+int if_getmtu(const char *);
 int if_getflags(int, int);
 int lladdropt_length(struct sockaddr_dl *);
 void lladdropt_fill(struct sockaddr_dl *, struct nd_opt_hdr *);
 char *get_next_msg(char *, char *, int, size_t *, int);
 struct in6_addr *get_addr(char *);
 int get_rtm_ifindex(char *);
 int get_ifm_ifindex(char *);
 int get_ifam_ifindex(char *);
 int get_ifm_flags(char *);
 int get_prefixlen(char *);
 int prefixlen(const unsigned char *, const unsigned char *);
 int rtmsg_type(char *);
 int ifmsg_type(char *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtadvd.c,v 1.37 2011/12/11 15:25:52 joerg Exp $	*/
+/*	$NetBSD: rtadvd.c,v 1.38 2011/12/11 20:44:44 christos 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
 @@ -123,31 +123,33 @@ uint32_t ndopt_flags[] = {
 	[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,
 };
 #ifdef notdef
 struct sockaddr_in6 sin6_linklocal_allrouters = {
 	.sin6_len =	sizeof(sin6_linklocal_allrouters),
 	.sin6_family =	AF_INET6,
 	.sin6_addr =	IN6ADDR_LINKLOCAL_ALLROUTERS_INIT,
 };
 #endif
 struct sockaddr_in6 sin6_sitelocal_allrouters = {
 	.sin6_len =	sizeof(sin6_sitelocal_allrouters),
 	.sin6_family =	AF_INET6,
 	.sin6_addr =	IN6ADDR_SITELOCAL_ALLROUTERS_INIT,
 };
 static void set_die(int);
 static void die(void) __dead;
 static void sock_open(void);
 static void rtsock_open(void);
 static void rtadvd_input(void);
 static void rs_input(int, struct nd_router_solicit *,
     struct in6_pktinfo *, struct sockaddr_in6 *);