 @@ -1,1308 +1,1237 @@
-/*	$NetBSD: config.c,v 1.43 2019/11/11 13:42:49 roy Exp $	*/
+/*	$NetBSD: config.c,v 1.44 2020/04/21 12:16:47 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
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * 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/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <net/if_dl.h>
 #ifdef __FreeBSD__
 #include <net/if_var.h>
 #endif
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
 #include <netinet6/nd6.h>
 #include <arpa/inet.h>
 #include <stdio.h>
 #include <syslog.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <search.h>
 #include <unistd.h>
 #include <ifaddrs.h>
 #include <inttypes.h>
 #include "rtadvd.h"
 #include "advcap.h"
 #include "timer.h"
 #include "if.h"
 #include "config.h"
 #include "logit.h"
 #include "prog_ops.h"
 #ifndef __arraycount
 #define __arraycount(__x)	(sizeof(__x) / sizeof(__x[0]))
 #endif
 static time_t prefix_timo = (60 * 120);	/* 2 hours.
 					 * XXX: should be configurable. */
 static struct rtadvd_timer *prefix_timeout(void *);
 static void makeentry(char *, size_t, int, const char *);
 static int getinet6sysctl(int);
 static size_t
 encode_domain(char *dst, const char *src)
+{
 	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
 free_rainfo(struct rainfo *rai)
+{
 	struct soliciter *sol;
 	struct prefix *pfx;
 	struct rtinfo *rti;
 	struct rdnss *rdnss;
 	struct rdnss_addr *rdnsa;
 	struct dnssl *dnssl;
 	struct dnssl_domain *dnsd;
 	rtadvd_remove_timer(&rai->timer);
 	rtadvd_remove_timer(&rai->timer_sol);
 	while ((sol = TAILQ_FIRST(&rai->soliciter))) {
 		TAILQ_REMOVE(&rai->soliciter, sol, next);
 		free(sol);
+	}
 	while ((pfx = TAILQ_FIRST(&rai->prefix))) {
 		TAILQ_REMOVE(&rai->prefix, pfx, next);
 		free(pfx);
+	}
 	while ((rti = TAILQ_FIRST(&rai->route))) {
 		TAILQ_REMOVE(&rai->route, rti, next);
 		free(rti);
+	}
 	while ((rdnss = TAILQ_FIRST(&rai->rdnss))) {
 		TAILQ_REMOVE(&rai->rdnss, rdnss, next);
 		while ((rdnsa = TAILQ_FIRST(&rdnss->list))) {
 			TAILQ_REMOVE(&rdnss->list, rdnsa, next);
 			free(rdnsa);
+		}
 		free(rdnss);
+	}
 	while ((dnssl = TAILQ_FIRST(&rai->dnssl))) {
 		TAILQ_REMOVE(&rai->dnssl, dnssl, next);
 		while ((dnsd = TAILQ_FIRST(&dnssl->list))) {
 			TAILQ_REMOVE(&dnssl->list, dnsd, next);
 			free(dnsd);
+		}
 		free(dnssl);
+	}
 	free(rai->sdl);
 	free(rai->ra_data);
 	free(rai);
+}
 void
 getconfig(const char *intface, int exithard)
+{
 	int stat, c, i;
 	char tbuf[BUFSIZ];
 	struct rainfo *tmp, *rai;
 	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];
 	struct rdnss *rdnss;
 	struct dnssl *dnssl;
 #define MUSTHAVE(var, cap)	\
     do {								\
 	int64_t t;							\
 	if ((t = agetnum(cap)) < 0) {					\
 		fprintf(stderr, "rtadvd: need %s for interface %s\n",	\
 			cap, intface);					\
 		goto errexit;						\
 	}								\
 	var = t;							\
      } while (0)
 #define MAYHAVE(var, cap, def)	\
      do {								\
 	if ((var = agetnum(cap)) < 0)					\
 		var = def;						\
      } while (0)
 #define	ELM_MALLOC(p)					\
 	do {								\
 		p = calloc(1, sizeof(*p));				\
 		if (p == NULL) {					\
 			logit(LOG_ERR, "<%s> calloc failed: %m",	\
 			    __func__);					\
 			goto errexit;					\
 		}							\
 	} while(/*CONSTCOND*/0)
 	if (if_nametoindex(intface) == 0) {
 		logit(LOG_INFO, "<%s> interface %s not found, ignoring",
 		       __func__, intface);
 		return;
+	}
 	logit(LOG_DEBUG, "<%s> loading configuration for interface %s",
 	       __func__, intface);
 	if ((stat = agetent(tbuf, intface)) <= 0) {
 		memset(tbuf, 0, sizeof(tbuf));
 		logit(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);
 	TAILQ_INIT(&tmp->soliciter);
 	TAILQ_INIT(&tmp->prefix);
 	TAILQ_INIT(&tmp->route);
 	TAILQ_INIT(&tmp->rdnss);
 	TAILQ_INIT(&tmp->dnssl);
 	/* 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) {
 		if ((tmp->sdl = if_nametosdl(intface)) == NULL) {
 			logit(LOG_ERR,
 			       "<%s> can't get information of %s",
 			       __func__, intface);
 			goto errexit;
+		}
 		tmp->ifindex = tmp->sdl->sdl_index;
 	} else {
 		tmp->ifindex = if_nametoindex(intface);
 		if (tmp->ifindex == 0) {
 			logit(LOG_ERR,
 			       "<%s> can't get information of %s",
 			       __func__, intface);
 			goto errexit;
+		}
+	}
 	tmp->ifflags = if_getflags(tmp->ifindex, 0);
 	strlcpy(tmp->ifname, intface, sizeof(tmp->ifname));
 	if ((tmp->phymtu = if_getmtu(intface)) == 0) {
 		tmp->phymtu = IPV6_MMTU;
 		logit(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) {
 		logit(LOG_ERR,
 		       "<%s> maxinterval (%d) on %s is invalid "
 		       "(must be between %u and %u)", __func__, val,
 		       intface, MIN_MAXINTERVAL, MAX_MAXINTERVAL);
 		goto errexit;
+	}
 	tmp->maxinterval = val;
 	MAYHAVE(val, "mininterval", tmp->maxinterval/3);
 	if (val < MIN_MININTERVAL || val > (tmp->maxinterval * 3) / 4) {
 		logit(LOG_ERR,
 		       "<%s> mininterval (%d) on %s is invalid "
 		       "(must be between %u and %d)",
 		       __func__, val, intface, MIN_MININTERVAL,
 		       (tmp->maxinterval * 3) / 4);
 		goto errexit;
+	}
 	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')) {
 			if ((val & ND_RA_FLAG_RTPREF_HIGH)) {
 				logit(LOG_ERR, "<%s> the \'h\' and \'l\'"
 				    " router flags are exclusive", __func__);
 				goto errexit;
+			}
 			val |= ND_RA_FLAG_RTPREF_LOW;
+		}
 	} else {
 		MAYHAVE(val, "raflags", 0);
+	}
 	tmp->managedflg = val & ND_RA_FLAG_MANAGED;
 	tmp->otherflg = val & ND_RA_FLAG_OTHER;
 #ifndef ND_RA_FLAG_RTPREF_MASK
 #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) {
 		logit(LOG_ERR, "<%s> invalid router preference (%02x) on %s",
 		       __func__, tmp->rtpref, intface);
 		goto errexit;
+	}
 	MAYHAVE(val, "rltime", DEF_ADVROUTERLIFETIME);
 	if (val && (val < tmp->maxinterval || val > MAXROUTERLIFETIME)) {
 		logit(LOG_ERR,
 		       "<%s> router lifetime (%d) on %s is invalid "
 		       "(must be 0 or between %d and %d)",
 		       __func__, val, intface,
 		       tmp->maxinterval, MAXROUTERLIFETIME);
 		goto errexit;
+	}
 	/*
 	 * 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) {
 		logit(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);
 		goto errexit;
+	}
 	tmp->lifetime = val & 0xffff;
 	MAYHAVE(val, "rtime", DEF_ADVREACHABLETIME);
 	if (val < 0 || val > MAXREACHABLETIME) {
 		logit(LOG_ERR,
 		       "<%s> reachable time (%d) on %s is invalid "
 		       "(must be no greater than %d)",
 		       __func__, val, intface, MAXREACHABLETIME);
 		goto errexit;
+	}
 	tmp->reachabletime = (uint32_t)val;
 	MAYHAVE(val64, "retrans", DEF_ADVRETRANSTIMER);
 	if (val64 < 0 || val64 > 0xffffffff) {
 		logit(LOG_ERR, "<%s> retrans time (%lld) on %s out of range",
 		       __func__, (long long)val64, intface);
 		goto errexit;
+	}
 	tmp->retranstimer = (uint32_t)val64;
 	if (agetnum("hapref") != -1 || agetnum("hatime") != -1) {
 		logit(LOG_ERR,
 		       "<%s> mobile-ip6 configuration not supported",
 		       __func__);
 		goto errexit;
+	}
 	/* 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;
 	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 = calloc(1, sizeof(*pfx))) == NULL) {
 			logit(LOG_ERR,
 			       "<%s> can't allocate memory: %m",
 			       __func__);
 			goto errexit;
+		}
 		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) {
 			logit(LOG_ERR,
 			       "<%s> inet_pton failed for %s",
 			       __func__, addr);
 			goto errexit;
+		}
 		if (IN6_IS_ADDR_MULTICAST(&pfx->prefix)) {
 			logit(LOG_ERR,
 			       "<%s> multicast prefix (%s) must "
 			       "not be advertised on %s",
 			       __func__, addr, intface);
 			goto errexit;
+		}
 		if (IN6_IS_ADDR_LINKLOCAL(&pfx->prefix))
 			logit(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) {
 			logit(LOG_ERR, "<%s> prefixlen (%d) for %s "
 			       "on %s out of range",
 			       __func__, val, addr, intface);
 			goto errexit;
+		}
 		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;
 		} else {
 			MAYHAVE(val, entbuf,
 			    (ND_OPT_PI_FLAG_ONLINK|ND_OPT_PI_FLAG_AUTO));
+		}
 		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) {
 			logit(LOG_ERR, "<%s> vltime (%lld) for "
 			    "%s/%d on %s is out of range",
 			    __func__, (long long)val64,
 			    addr, pfx->prefixlen, intface);
 			goto errexit;
+		}
 		pfx->validlifetime = (uint32_t)val64;
 		makeentry(entbuf, sizeof(entbuf), i, "vltimedecr");
 		if (agetflag(entbuf)) {
 			struct timespec now;
 			prog_clock_gettime(CLOCK_MONOTONIC, &now);
 			pfx->vltimeexpire =
 				now.tv_sec + pfx->validlifetime;
+		}
 		makeentry(entbuf, sizeof(entbuf), i, "pltime");
 		MAYHAVE(val64, entbuf, DEF_ADVPREFERREDLIFETIME);
 		if (val64 < 0 || val64 > 0xffffffff) {
 			logit(LOG_ERR,
 			    "<%s> pltime (%lld) for %s/%d on %s "
 			    "is out of range",
 			    __func__, (long long)val64,
 			    addr, pfx->prefixlen, intface);
 			goto errexit;
+		}
 		pfx->preflifetime = (uint32_t)val64;
 		makeentry(entbuf, sizeof(entbuf), i, "pltimedecr");
 		if (agetflag(entbuf)) {
 			struct timespec now;
 			prog_clock_gettime(CLOCK_MONOTONIC, &now);
 			pfx->pltimeexpire =
 				now.tv_sec + pfx->preflifetime;
+		}
+	}
 	if (TAILQ_FIRST(&tmp->prefix) == NULL && !agetflag("noifprefix"))
 		get_prefix(tmp);
 	MAYHAVE(val64, "mtu", 0);
 	if (val64 < 0 || val64 > 0xffffffff) {
 		logit(LOG_ERR,
 		       "<%s> mtu (%" PRIi64 ") on %s out of range",
 		       __func__, val64, intface);
 		goto errexit;
+	}
 	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) {
 		logit(LOG_ERR,
 		       "<%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);
 		goto errexit;
+	}
 	/* route information */
 	for (i = -1; i < MAXROUTE; i++) {
 		struct rtinfo *rti;
 		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;
 		ELM_MALLOC(rti);
 		memset(rti, 0, sizeof(*rti));
 		/* link into chain */
 		TAILQ_INSERT_TAIL(&tmp->route, rti, next);
 		if (inet_pton(AF_INET6, addr, &rti->prefix) != 1) {
 			logit(LOG_ERR, "<%s> inet_pton failed for %s",
 			       __func__, addr);
 			goto errexit;
+		}
 #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.
 		 */
 		MAYHAVE(val64, entbuf, DEF_ADVVALIDLIFETIME);
 		if (IN6_IS_ADDR_MULTICAST(&rti->prefix)) {
 			logit(LOG_ERR,
 			       "<%s> multicast route (%s) must "
 			       "not be advertised on %s",
 			       __func__, addr, intface);
 			goto errexit;
+		}
 		if (IN6_IS_ADDR_LINKLOCAL(&rti->prefix)) {
 			logit(LOG_NOTICE,
 			       "<%s> link-local route (%s) will "
 			       "be advertised on %s",
 			       __func__, addr, intface);
 			goto errexit;
+		}
 #endif
 		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) {
 			logit(LOG_ERR, "<%s> prefixlen (%d) for %s on %s "
 			       "out of range",
 			       __func__, val, addr, intface);
 			goto errexit;
+		}
 		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)) {
 					logit(LOG_ERR,
 					    "<%s> the \'h\' and \'l\' route"
 					    " preferences are exclusive",
 					    __func__);
 					goto errexit;
+				}
 				val |= ND_RA_FLAG_RTPREF_LOW;
+			}
 		} else
 			MAYHAVE(val, entbuf, 256); /* XXX */
 		if (val == 256) {
 			makeentry(oentbuf, sizeof(oentbuf), i, "rtrflags");
 			MAYHAVE(val, oentbuf, 256);
 			if (val != 256) {
 				fprintf(stderr, "%s was obsoleted.  Use %s.\n",
 					oentbuf, entbuf);
 			} else
 				val = 0;
+		}
 		rti->rtpref = val & ND_RA_FLAG_RTPREF_MASK;
 		if (rti->rtpref == ND_RA_FLAG_RTPREF_RSV) {
 			logit(LOG_ERR, "<%s> invalid route preference (%02x) "
 			       "for %s/%d on %s",
 			       __func__, rti->rtpref, addr,
 			       rti->prefixlen, intface);
 			goto errexit;
+		}
 		/*
 		 * Since the spec does not a default value, we should make
 		 * this entry mandatory.  However, FreeBSD 4.4 has shipped
 		 * with this field being optional, we use the router lifetime
 		 * as an ad-hoc default value with a warning message.
 		 */
 		makeentry(entbuf, sizeof(entbuf), i, "rtltime");
 		MAYHAVE(val64, entbuf, -1);
 		if (val64 == -1) {
 			makeentry(oentbuf, sizeof(oentbuf), i, "rtrltime");
 			MAYHAVE(val64, oentbuf, -1);
 			if (val64 != -1) {
 				fprintf(stderr, "%s was obsoleted.  Use %s.\n",
 					oentbuf, entbuf);
 			} else {
 				fprintf(stderr, "%s should be specified "
 					"for interface %s.\n",
 					entbuf, intface);
 				val64 = tmp->lifetime;
+			}
+		}
 		if (val64 < 0 || val64 > 0xffffffff) {
 			logit(LOG_ERR, "<%s> route lifetime (%lld) for "
 			    "%s/%d on %s out of range", __func__,
 			    (long long)val64, addr, rti->prefixlen, intface);
 			goto errexit;
+		}
 		rti->ltime = (uint32_t)val64;
+	}
 	/* RDNSS */
 	for (i = -1; i < MAXRDNSS; i++) {
 		struct rdnss_addr *rdnsa;
 		makeentry(entbuf, sizeof(entbuf), i, "rdnss");
 		addr = (char *)agetstr(entbuf, &bp);
 		if (addr == NULL)
 			continue;
 		ELM_MALLOC(rdnss);
 		TAILQ_INSERT_TAIL(&tmp->rdnss, rdnss, next);
 		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);
 			TAILQ_INSERT_TAIL(&rdnss->list, rdnsa, next);
 			if (inet_pton(AF_INET6, abuf, &rdnsa->addr) != 1) {
 				logit(LOG_ERR, "<%s> inet_pton failed for %s",
 			           __func__, addr);
 				goto errexit;
+			}
+		}
 		makeentry(entbuf, sizeof(entbuf), i, "rdnssltime");
 		MAYHAVE(val64, entbuf, tmp->maxinterval * 3 / 2);
 		if (val64 < 0 || val64 > 0xffffffff) {
 			logit(LOG_ERR, "<%s> %s (%lld) on %s is invalid",
 			     __func__, entbuf, (long long)val64, intface);
 			goto errexit;
+		}
 		rdnss->lifetime = (uint32_t)val64;
+	}
 	/* DNSSL */
 	TAILQ_INIT(&tmp->dnssl);
 	for (i = -1; i < MAXDNSSL; i++) {
 		struct dnssl_domain *dnsd;
 		makeentry(entbuf, sizeof(entbuf), i, "dnssl");
 		addr = (char *)agetstr(entbuf, &bp);
 		if (addr == NULL)
 			continue;
 		ELM_MALLOC(dnssl);
 		TAILQ_INSERT_TAIL(&tmp->dnssl, dnssl, next);
 		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);
 			TAILQ_INSERT_TAIL(&dnssl->list, dnsd, next);
 			dnsd->len = encode_domain(dnsd->domain, abuf);
+		}
 		makeentry(entbuf, sizeof(entbuf), i, "dnsslltime");
 		MAYHAVE(val64, entbuf, tmp->maxinterval * 3 / 2);
 		if (val64 < 0 || val64 > 0xffffffff) {
 			logit(LOG_ERR, "<%s> %s (%lld) on %s is invalid",
 			     __func__, entbuf, (long long)val64, intface);
 			goto errexit;
+		}
 		dnssl->lifetime = (uint32_t)val64;
+	}
 	TAILQ_FOREACH(rai, &ralist, next) {
 		if (rai->ifindex == tmp->ifindex) {
 			TAILQ_REMOVE(&ralist, rai, next);
 			if (Cflag) {
 				free_rainfo(rai);
 				rai = NULL;
 				break;
+			}
 			/* If we already have a leaving RA use that
 			 * as this config hasn't been advertised */
 			if (rai->leaving) {
 				tmp->leaving = rai->leaving;
 				free_rainfo(rai);
 				rai = tmp->leaving;
 				rai->leaving_for = tmp;
 				break;
+			}
 			rai->lifetime = 0;
 			TAILQ_FOREACH(rdnss, &rai->rdnss, next)
 				rdnss->lifetime = 0;
 			TAILQ_FOREACH(dnssl, &rai->dnssl, next)
 				dnssl->lifetime = 0;
 			rai->leaving_for = tmp;
 			tmp->leaving = rai;
 			rai->initcounter = MAX_INITIAL_RTR_ADVERTISEMENTS;
 			rai->mininterval = MIN_DELAY_BETWEEN_RAS;
 			rai->maxinterval = MIN_DELAY_BETWEEN_RAS;
 			rai->leaving_adv = MAX_FINAL_RTR_ADVERTISEMENTS;
 			if (rai->timer == NULL)
 				rai->timer = rtadvd_add_timer(ra_timeout,
 							      ra_timer_update,
 							      rai, rai);
 			ra_timer_update((void *)rai, &rai->timer->tm);
 			rtadvd_set_timer(&rai->timer->tm, rai->timer);
 			break;
+		}
+	}
 	/* okey */
 	TAILQ_INSERT_TAIL(&ralist, tmp, next);
 	/* construct the sending packet */
 	make_packet(tmp);
 	/* set timer */
 	if (rai)
 		return;
 	tmp->timer = rtadvd_add_timer(ra_timeout, ra_timer_update,
 				      tmp, tmp);
 	ra_timer_set_short_delay(tmp, tmp->timer);
 	tmp->timer_sol = rtadvd_add_timer(ra_timeout_sol, NULL, tmp, NULL);
 	return;
 errexit:
 	if (exithard)
 		exit(1);
 	free_rainfo(tmp);
+}
 void
 get_prefix(struct rainfo *rai)
+{
 	struct ifaddrs *ifap, *ifa;
 	struct prefix *pp;
 	struct in6_addr *a;
 	unsigned char *p, *ep, *m, *lim;
 	char ntopbuf[INET6_ADDRSTRLEN];
 	if (getifaddrs(&ifap) < 0) {
 		logit(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 = (unsigned char *)&((struct sockaddr_in6 *)ifa->ifa_netmask)->sin6_addr;
 		lim = (unsigned char *)(ifa->ifa_netmask) + ifa->ifa_netmask->sa_len;
 		plen = prefixlen(m, lim);
 		if (plen <= 0 || plen > 128) {
 			logit(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 = calloc(1, sizeof(*pp))) == NULL) {
 			logit(LOG_ERR,
 			       "<%s> can't get allocate buffer for prefix",
 			       __func__);
 			exit(1);
+		}
 		/* 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;
+		}
 	        if (!inet_ntop(AF_INET6, &pp->prefix, ntopbuf,
 	            sizeof(ntopbuf))) {
 			logit(LOG_ERR, "<%s> inet_ntop failed", __func__);
 			exit(1);
+		}
 		logit(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 */
 		TAILQ_INSERT_TAIL(&rai->prefix, pp, next);
 		rai->pfxs++;
+	}
 	freeifaddrs(ifap);
+}
 static void
 makeentry(char *buf, size_t len, int id, const 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
  * able to be specified.
  */
 static void
 add_prefix(struct rainfo *rai, struct in6_prefixreq *ipr)
 	struct prefix *prefix;
 	char ntopbuf[INET6_ADDRSTRLEN];
 	if ((prefix = calloc(1, sizeof(*prefix))) == NULL) {
 		logit(LOG_ERR, "<%s> memory allocation failed",
 		       __func__);
 		return;		/* XXX: error or exit? */
 	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++;
 	logit(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 */
 	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;
 	TAILQ_REMOVE(&rai->prefix, prefix, next);
 	rai->pfxs--;
 	logit(LOG_DEBUG, "<%s> prefix %s/%d was deleted on %s",
 	       __func__, inet_ntop(AF_INET6, &prefix->prefix,
 				       ntopbuf, INET6_ADDRSTRLEN),
 	       prefix->prefixlen, rai->ifname);
 	rtadvd_remove_timer(&prefix->timer);
 	free(prefix);
+}
 void
 invalidate_prefix(struct prefix *prefix)
+{
 	char ntopbuf[INET6_ADDRSTRLEN];
 	struct timespec timo;
 	struct rainfo *rai = prefix->rainfo;
 	if (prefix->timer) {	/* sanity check */
 		logit(LOG_ERR,
 		    "<%s> assumption failure: timer already exists",
 		    __func__);
 		exit(1);
+	}
 	logit(LOG_DEBUG, "<%s> prefix %s/%d was invalidated on %s, "
 	    "will expire in %ld seconds", __func__,
 	    inet_ntop(AF_INET6, &prefix->prefix, ntopbuf, INET6_ADDRSTRLEN),
 	    prefix->prefixlen, rai->ifname, (long)prefix_timo);
 	/* set the expiration timer */
 	prefix->timer = rtadvd_add_timer(prefix_timeout, NULL, prefix, NULL);
 	if (prefix->timer == NULL) {
 		logit(LOG_ERR, "<%s> failed to add a timer for a prefix. "
 		    "remove the prefix", __func__);
 		delete_prefix(prefix);
+	}
 	timo.tv_sec = prefix_timo;
 	timo.tv_nsec = 0;
 	rtadvd_set_timer(&timo, prefix->timer);
+}
 static struct rtadvd_timer *
 prefix_timeout(void *arg)
+{
 	struct prefix *prefix = (struct prefix *)arg;
 	delete_prefix(prefix);
 	return(NULL);
+}
 void
 update_prefix(struct prefix * prefix)
+{
 	char ntopbuf[INET6_ADDRSTRLEN];
 	struct rainfo *rai = prefix->rainfo;
 	if (prefix->timer == NULL) { /* sanity check */
 		logit(LOG_ERR,
 		    "<%s> assumption failure: timer does not exist",
 		    __func__);
 		exit(1);
+	}
 	logit(LOG_DEBUG, "<%s> prefix %s/%d was re-enabled on %s",
 	    __func__, inet_ntop(AF_INET6, &prefix->prefix, ntopbuf,
 	    INET6_ADDRSTRLEN), prefix->prefixlen, rai->ifname);
 	/* stop the expiration timer */
 	rtadvd_remove_timer(&prefix->timer);
+}
 /*
- * Try to get an in6_prefixreq contents for a prefix which matches
+ * Add a prefix to the list of specified interface and reconstruct
- * ipr->ipr_prefix and ipr->ipr_plen and belongs to
+ * the outgoing packet.
- * the interface whose name is ipr->ipr_name[].
+ * The prefix must not be in the list.
  * XXX: other parameters of the prefix(e.g. lifetime) should be
  * able to be specified.
  */
-static int
+void
-init_prefix(struct in6_prefixreq *ipr)
+add_prefix(struct rainfo *rai, int ifindex, struct in6_addr *addr, int plen)
+{
-#if 0
+	struct prefix *prefix;
-	int s;
+	char ntopbuf[INET6_ADDRSTRLEN];
-	if ((s = prog_socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
+	if ((prefix = calloc(1, sizeof(*prefix))) == NULL) {
-		logit(LOG_ERR, "<%s> socket: %m", __func__);
+		logit(LOG_ERR, "<%s> memory allocation failed",
-		exit(1);
+		       __func__);
 		return;		/* XXX: error or exit? */
+	}
 	prefix->prefix = *addr;
 	prefix->prefixlen = plen;
 	prefix->validlifetime = DEF_ADVVALIDLIFETIME;
 	prefix->preflifetime = DEF_ADVPREFERREDLIFETIME;
 	prefix->onlinkflg = 1;
 	prefix->autoconfflg = 0;
 	prefix->origin = PREFIX_FROM_DYNAMIC;
-	if (prog_ioctl(s, SIOCGIFPREFIX_IN6, ipr) < 0) {
+	prefix->rainfo = rai;
-		logit(LOG_INFO, "<%s> ioctl:SIOCGIFPREFIX: %m", __func__);
+	TAILQ_INSERT_TAIL(&rai->prefix, prefix, next);
 	rai->pfxs++;
-		ipr->ipr_vltime = DEF_ADVVALIDLIFETIME;
+	logit(LOG_DEBUG, "<%s> new prefix %s/%d was added on %s",
-		ipr->ipr_pltime = DEF_ADVPREFERREDLIFETIME;
+	       __func__, inet_ntop(AF_INET6, addr, ntopbuf, INET6_ADDRSTRLEN),
-		ipr->ipr_raf_onlink = 1;
+	       plen, rai->ifname);
 		ipr->ipr_raf_auto = 1;
 		/* omit other field initialization */
 	else if (ipr->ipr_origin < PR_ORIG_RR) {
 		char ntopbuf[INET6_ADDRSTRLEN];
 		logit(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__,
 		       inet_ntop(AF_INET6, &ipr->ipr_prefix.sin6_addr, ntopbuf,
 				 sizeof(ntopbuf)), ipr->ipr_origin);
 		prog_close(s);
 		return 1;
 	prog_close(s);
 	return 0;
 #else
 	ipr->ipr_vltime = DEF_ADVVALIDLIFETIME;
 	ipr->ipr_pltime = DEF_ADVPREFERREDLIFETIME;
 	ipr->ipr_raf_onlink = 1;
 	ipr->ipr_raf_auto = 1;
 	return 0;
 #endif
-void
+	/* free the previous packet */
-make_prefix(struct rainfo *rai, int ifindex, struct in6_addr *addr, int plen)
+	free(rai->ra_data);
 	rai->ra_data = NULL;
 	struct in6_prefixreq ipr;
-	memset(&ipr, 0, sizeof(ipr));
+	/* reconstruct the packet */
-	if (if_indextoname(ifindex, ipr.ipr_name) == NULL) {
+	make_packet(rai);
 		logit(LOG_ERR, "<%s> Prefix added interface No.%d doesn't"
 		       "exist. This should not happen: %m", __func__,
 		       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
 make_packet(struct rainfo *rainfo)
+{
 	size_t packlen, lladdroptlen = 0;
 	char *buf;
 	struct nd_router_advert *ra;
 	struct nd_opt_prefix_info *ndopt_pi;
 	struct nd_opt_mtu *ndopt_mtu;
 	struct prefix *pfx;
 	struct nd_opt_route_info *ndopt_rti;
 	struct rtinfo *rti;
 	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) {
 			logit(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 (TAILQ_FIRST(&rainfo->prefix) != NULL)
 		packlen += sizeof(struct nd_opt_prefix_info) * rainfo->pfxs;
 	if (rainfo->linkmtu)
 		packlen += sizeof(struct nd_opt_mtu);
 	TAILQ_FOREACH(rti, &rainfo->route, next)
 		packlen += sizeof(struct nd_opt_route_info) +
 			   ((rti->prefixlen + 0x3f) >> 6) * 8;
 	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 = realloc(rainfo->ra_data, packlen)) == NULL) {
 		logit(LOG_ERR,
 		       "<%s> can't get enough memory for an RA packet %m",
 		       __func__);
 		exit(1);
+	}
 	rainfo->ra_data = buf;
 	/* XXX: what if packlen > 576? */
 	rainfo->ra_datalen = packlen;
 #define CHECKLEN(size) \
 	do { \
 		if (buf + size > rainfo->ra_data + packlen) { \
 			logit(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 timespec 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;
 		else {
 			if (pfx->vltimeexpire || pfx->pltimeexpire)
 				prog_clock_gettime(CLOCK_MONOTONIC, &now);
 			if (pfx->vltimeexpire == 0)
 				vltime = pfx->validlifetime;
 			else
 				vltime = (pfx->vltimeexpire > now.tv_sec) ?
 				    pfx->vltimeexpire - now.tv_sec : 0;
+		}
 		if (pfx->timer)
 			pltime = 0;
 		else {
 			if (pfx->pltimeexpire == 0)
 				pltime = pfx->preflifetime;
 			else
 				pltime = (pfx->pltimeexpire > now.tv_sec) ?
 				    pfx->pltimeexpire - now.tv_sec : 0;
+		}
 		if (vltime < pltime) {
 			/*
 			 * 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);
+	}
 	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)
+{
 	const int mib[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, code };
 	int value;
 	size_t size;
 	size = sizeof(value);
 	if (prog_sysctl(mib, __arraycount(mib), &value, &size, NULL, 0)
 	    < 0) {
 		logit(LOG_ERR, "<%s>: failed to get ip6 sysctl(%d): %m",
 		       __func__, code);
 		return -1;
+	}
 	else
 		return value;
+}

 @@ -1,1617 +1,1617 @@
-/*	$NetBSD: rtadvd.c,v 1.72 2020/04/21 12:05:54 roy Exp $	*/
+/*	$NetBSD: rtadvd.c,v 1.73 2020/04/21 12:16:47 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
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * 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/param.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/queue.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <net/if_dl.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
 #include <arpa/inet.h>
 #include <time.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <err.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <syslog.h>
 #include <stdarg.h>
 #ifdef __NetBSD__
 #include <util.h>
 #endif
 #include <poll.h>
 #include <pwd.h>
 #include "rtadvd.h"
 #include "advcap.h"
 #include "timer.h"
 #include "if.h"
 #include "config.h"
 #include "dump.h"
 #include "logit.h"
 #include "prog_ops.h"
 #include "expandm.h"
 struct msghdr rcvmhdr;
 static unsigned char *rcvcmsgbuf;
 static size_t rcvcmsgbuflen;
 static unsigned char *sndcmsgbuf;
 static size_t sndcmsgbuflen;
 volatile sig_atomic_t do_dump;
 volatile sig_atomic_t do_reconf;
 volatile sig_atomic_t do_die;
 struct msghdr sndmhdr;
 struct iovec rcviov[2];
 struct iovec sndiov[2];
 struct sockaddr_in6 rcvfrom;
 static const char *dumpfilename = "/var/run/rtadvd.dump"; /* XXX configurable */
 int sock;
 int rtsock = -1;
 int Cflag = 0, dflag = 0, sflag = 0, Dflag;
 static char **if_argv;
 static int if_argc;
 char *conffile = NULL;
 struct ralist_head_t ralist = TAILQ_HEAD_INITIALIZER(ralist);
 struct nd_optlist {
 	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;
 		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	(1 << 0)
 #define NDOPT_FLAG_TGTLINKADDR	(1 << 1)
 #define NDOPT_FLAG_PREFIXINFO	(1 << 2)
 #define NDOPT_FLAG_RDHDR	(1 << 3)
 #define NDOPT_FLAG_MTU		(1 << 4)
 #define NDOPT_FLAG_RDNSS	(1 << 5)
 #define NDOPT_FLAG_DNSSL	(1 << 6)
 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,
 };
 #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);
 static void set_reconf(int);
 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 *);
 static void ra_input(int, struct nd_router_advert *,
     struct in6_pktinfo *, struct sockaddr_in6 *);
 static struct rainfo *ra_output(struct rainfo *, bool);
 static int prefix_check(struct nd_opt_prefix_info *, struct rainfo *,
     struct sockaddr_in6 *);
 static int nd6_options(struct nd_opt_hdr *, int, union nd_opts *, uint32_t);
 static void free_ndopts(union nd_opts *);
 static void rtmsg_input(void);
 static void rtadvd_set_dump_file(int);
 int
 main(int argc, char *argv[])
+{
 	struct pollfd set[2];
 	struct timespec *timeout;
 	int i, ch;
 	int fflag = 0, logopt;
 	struct passwd *pw;
 	const char *pidfilepath = NULL;
 	pid_t pid;
 	/* get command line options and arguments */
 #define OPTIONS "c:dDfM:p:s"
 	while ((ch = getopt(argc, argv, OPTIONS)) != -1) {
 #undef OPTIONS
 		switch (ch) {
 		case 'c':
 			conffile = optarg;
 			break;
 		case 'C':
 			Cflag++;
 			break;
 		case 'd':
 			dflag++;
 			break;
 		case 'D':
 			Dflag++;
 			break;
 		case 'f':
 			fflag = 1;
 			break;
 		case 'p':
 			pidfilepath = optarg;
 			break;
 		case 's':
 			sflag = 1;
 			break;
+		}
+	}
 	argc -= optind;
 	argv += optind;
 	if (argc == 0) {
 		fprintf(stderr, "Ysage: %s [-DdfRs] [-c conffile]"
 		    " [-M ifname] [-p pidfile] interface ...\n", getprogname());
 		return EXIT_FAILURE;
+	}
 	if ((pid = pidfile_lock(pidfilepath)) != 0) {
 		if (pid == -1)
 			logit(LOG_ERR, "pidfile_lock: %m");
 			/* Continue */
 		else {
 			logit(LOG_ERR, "Another instance of `%s' is running "
 			    "(pid %d); exiting.", getprogname(), pid);
 			return EXIT_FAILURE;
+		}
+	}
 	if (prog_init && prog_init() == -1)
 		err(EXIT_FAILURE, "init failed");
 	logopt = LOG_NDELAY | LOG_PID;
 	if (fflag)
 		logopt |= LOG_PERROR;
 	openlog("rtadvd", logopt, LOG_DAEMON);
 	/* set log level */
 	if (dflag == 0)
 		(void)setlogmask(LOG_UPTO(LOG_ERR));
 	if (dflag == 1)
 		(void)setlogmask(LOG_UPTO(LOG_INFO));
 	errno = 0; /* Ensure errno is 0 so we know if getpwnam errors or not */
 	if ((pw = getpwnam(RTADVD_USER)) == NULL) {
 		if (errno == 0)
 			logit(LOG_ERR,
 			    "user %s does not exist, aborting",
 			    RTADVD_USER);
 		else
 			logit(LOG_ERR, "getpwnam: %s: %m", RTADVD_USER);
 		return EXIT_FAILURE;
+	}
 	/* timer initialization */
 	rtadvd_timer_init();
 	if_argc = argc;
 	if_argv = argv;
 	while (argc--)
 		getconfig(*argv++, 1);
 	if (!fflag) {
 		prog_daemon(1, 0);
 		if (pidfile_lock(pidfilepath) != 0)
 			logit(LOG_ERR, " pidfile_lock: %m");
+	}
 	sock_open();
 	set[0].fd = sock;
 	set[0].events = POLLIN;
 	if (sflag == 0) {
 		rtsock_open();
 		set[1].fd = rtsock;
 		set[1].events = POLLIN;
 	} else
 		set[1].fd = -1;
 	logit(LOG_INFO, "dropping privileges to %s", RTADVD_USER);
 	if (prog_chroot(pw->pw_dir) == -1) {
 		logit(LOG_ERR, "chroot: %s: %m", pw->pw_dir);
 		return EXIT_FAILURE;
+	}
 	if (prog_chdir("/") == -1) {
 		logit(LOG_ERR, "chdir: /: %m");
 		return EXIT_FAILURE;
+	}
 	if (prog_setgroups(1, &pw->pw_gid) == -1 ||
 	    prog_setgid(pw->pw_gid) == -1 ||
 	    prog_setuid(pw->pw_uid) == -1)
+	{
 		logit(LOG_ERR, "failed to drop privileges: %m");
 		return EXIT_FAILURE;
+	}
 	signal(SIGINT, set_die);
 	signal(SIGTERM, set_die);
 	signal(SIGHUP, set_reconf);
 	signal(SIGUSR1, rtadvd_set_dump_file);
 	for (;;) {
 		if (do_dump) {	/* SIGUSR1 */
 			do_dump = 0;
 			rtadvd_dump_file(dumpfilename);
+		}
 		if (do_reconf) { /* SIGHUP */
 			do_reconf = 0;
 			logit(LOG_INFO, "%s: reloading config on SIGHUP",
 			       __func__);
 			argc = if_argc;
 			argv = if_argv;
 			while (argc--)
 				getconfig(*argv++, 0);
+		}
 		/* timer expiration check and reset the timer */
 		timeout = rtadvd_check_timer();
 		if (do_die) {
 			die();
 			/*NOTREACHED*/
+		}
 		if (timeout != NULL) {
 			logit(LOG_DEBUG,
 			    "%s: set timer to %jd:%jd. waiting for "
 			    "inputs or timeout", __func__,
 			    (intmax_t)timeout->tv_sec,
 			    (intmax_t)timeout->tv_nsec);
 		} else {
 			logit(LOG_DEBUG,
 			    "%s: there's no timer. waiting for inputs",
 			    __func__);
+		}
 		if ((i = prog_poll(set, 2, timeout ? (timeout->tv_sec * 1000 +
 		    (timeout->tv_nsec + 999999) / 1000000) : INFTIM)) == -1)
+		{
 			/* EINTR would occur upon SIGUSR1 for status dump */
 			if (errno == EINTR) {
 				if (do_die)
 					die();
 				continue;
+			}
 			logit(LOG_ERR, "%s: poll: %m", __func__);
 			if (Dflag)
 				exit(1);
+		}
 		if (i == 0)	/* timeout */
 			continue;
 		if (rtsock != -1 && set[1].revents & POLLIN)
 			rtmsg_input();
 		if (set[0].revents & POLLIN)
 			rtadvd_input();
+	}
 	return EXIT_SUCCESS;	/* NOTREACHED */
+}
 static void
 rtadvd_set_dump_file(__unused int sig)
+{
 	do_dump = 1;
+}
 static void
 set_reconf(__unused int sig)
+{
 	do_reconf = 1;
+}
 static void
 set_die(__unused int sig)
+{
 	do_die = 1;
+}
 static void
 die(void)
+{
 	static int waiting;
 	struct rainfo *rai, *ran;
 	struct rdnss *rdnss;
 	struct dnssl *dnssl;
 	if (waiting) {
 		if (TAILQ_FIRST(&ralist)) {
 			logit(LOG_INFO,
 			       "%s: waiting for expiration of all RA timers",
 			       __func__);
 			return;
+		}
 		logit(LOG_NOTICE, "%s: gracefully terminated", __func__);
 		free(rcvcmsgbuf);
 		free(sndcmsgbuf);
 		exit(EXIT_SUCCESS);
 		/* NOT REACHED */
+	}
 	if (TAILQ_FIRST(&ralist) == NULL) {
 		logit(LOG_NOTICE, "%s: gracefully terminated", __func__);
 		exit(EXIT_SUCCESS);
 		/* NOT REACHED */
+	}
 	waiting = 1;
 	logit(LOG_NOTICE, "%s: final RA transmission started", __func__);
 	TAILQ_FOREACH_SAFE(rai, &ralist, next, ran) {
 		if (rai->leaving) {
 			TAILQ_REMOVE(&ralist, rai, next);
 			TAILQ_INSERT_HEAD(&ralist, rai->leaving, next);
 			rai->leaving->leaving = rai->leaving;
 			rai->leaving->leaving_for = rai->leaving;
 			free_rainfo(rai);
 			continue;
+		}
 		rai->lifetime = 0;
 		TAILQ_FOREACH(rdnss, &rai->rdnss, next)
 			rdnss->lifetime = 0;
 		TAILQ_FOREACH(dnssl, &rai->dnssl, next)
 			dnssl->lifetime = 0;
 		make_packet(rai);
 		rai->leaving = rai;
 		rai->leaving_for = rai;
 		rai->initcounter = MAX_INITIAL_RTR_ADVERTISEMENTS;
 		rai->mininterval = MIN_DELAY_BETWEEN_RAS;
 		rai->maxinterval = MIN_DELAY_BETWEEN_RAS;
 		rai->leaving_adv = MAX_FINAL_RTR_ADVERTISEMENTS;
 		ra_output(rai, false);
 		ra_timer_update(rai, &rai->timer->tm);
 		rtadvd_set_timer(&rai->timer->tm, rai->timer);
+	}
 	exit(EXIT_SUCCESS);
+}
 static void
 ra_timer_reset(struct rainfo *rai)
+{
 	rtadvd_remove_timer(&rai->timer);
 	rai->timer = rtadvd_add_timer(ra_timeout, ra_timer_update, rai, rai);
 	ra_timer_update(rai, &rai->timer->tm);
 	rtadvd_set_timer(&rai->timer->tm, rai->timer);
 	rtadvd_remove_timer(&rai->timer_sol);
 	rai->timer_sol = rtadvd_add_timer(ra_timeout_sol, NULL, rai, NULL);
+}
 static void
 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, **argv;
 	char ifname[IF_NAMESIZE];
 	struct prefix *prefix;
 	struct rainfo *rai;
 	struct in6_addr *addr;
 	char addrbuf[INET6_ADDRSTRLEN];
 	int prefixchange = 0, argc;
 	memset(&buffer, 0, sizeof(buffer));
 	n = prog_read(rtsock, &buffer, sizeof(buffer));
 	/* We read the buffer first to clear the FD */
 	if (do_die)
 		return;
 	msg = buffer.data;
 	if (dflag > 1) {
 		logit(LOG_DEBUG, "%s: received a routing message "
 		    "(type = %d, len = %d)", __func__, rtmsg_type(msg),
 		    rtmsg_len(msg));
+	}
 	if (n > rtmsg_len(msg)) {
 		/*
 		 * This usually won't happen for messages received on
 		 * a routing socket.
 		 */
 		if (dflag > 1)
 			logit(LOG_DEBUG,
 			    "%s: received data length is larger than "
 			    "1st routing message len. multiple messages? "
 			    "read %d bytes, but 1st msg len = %d",
 			    __func__, n, rtmsg_len(msg));
 #if 0
 		/* adjust length */
 		n = rtmsg_len(msg);
 #endif
+	}
 	lim = msg + n;
 	for (next = msg; next < lim; next += len) {
 		int oldifflags;
 		next = get_next_msg(next, lim, 0, &len,
 				    RTADV_TYPE2BITMASK(RTM_ADD) |
 				    RTADV_TYPE2BITMASK(RTM_DELETE) |
 				    RTADV_TYPE2BITMASK(RTM_NEWADDR) |
 				    RTADV_TYPE2BITMASK(RTM_DELADDR) |
 #ifdef RTM_IFANNOUNCE
 				    RTADV_TYPE2BITMASK(RTM_IFANNOUNCE) |
 #endif
 				    RTADV_TYPE2BITMASK(RTM_IFINFO));
 		if (len == 0)
 			break;
 		type = rtmsg_type(next);
 		switch (type) {
 		case RTM_ADD:
 		case RTM_DELETE:
 			ifindex = get_rtm_ifindex(next);
 			break;
 		case RTM_NEWADDR:
 		case RTM_DELADDR:
 			ifindex = get_ifam_ifindex(next);
 			break;
 #ifdef RTM_IFANNOUNCE
 		case RTM_IFANNOUNCE:
 			ifindex = get_ifan_ifindex(next);
 			if (get_ifan_what(next) == IFAN_ARRIVAL) {
 				logit(LOG_DEBUG,
 				       "%s: interface %s arrived",
 				       __func__,
 				       if_indextoname(ifindex, ifname));
 				if (if_argc == 0) {
 					getconfig(ifname, 0);
 					continue;
+				}
 				argc = if_argc;
 				argv = if_argv;
 				while (argc--) {
 					if (strcmp(ifname, *argv++) == 0) {
 						getconfig(ifname, 0);
 						break;
+					}
+				}
 				continue;
+			}
 			break;
 #endif
 		case RTM_IFINFO:
 			ifindex = get_ifm_ifindex(next);
 			break;
 		default:
 			/* should not reach here */
 			if (dflag > 1) {
 				logit(LOG_DEBUG, "%s: unknown rtmsg %d on %s",
 				       __func__, type,
 				       if_indextoname(ifindex, ifname));
+			}
 			continue;
+		}
 		if ((rai = if_indextorainfo(ifindex)) == NULL) {
 			if (dflag > 1) {
 				logit(LOG_DEBUG,
 				       "%s: route changed on "
 				       "non advertising interface %s (%d)",
 				       __func__,
 				       if_indextoname(ifindex, ifname),
 				       ifindex);
+			}
 			continue;
+		}
 		oldifflags = rai->ifflags;
 		switch (type) {
 		case RTM_ADD:
 			/* init ifflags because it may have changed */
 			rai->ifflags = if_getflags(ifindex, rai->ifflags);
 			if (sflag)
 				break;	/* we aren't interested in prefixes  */
 			addr = get_addr(msg);
 			plen = get_prefixlen(msg);
 			/* sanity check for plen */
 			/* as RFC2373, prefixlen is at least 4 */
 			if (plen < 4 || plen > 127) {
 				logit(LOG_INFO, "%s: new interface route's"
 				    "plen %d is invalid for a prefix",
 				    __func__, plen);
 				break;
+			}
 			prefix = find_prefix(rai, addr, plen);
 			if (prefix) {
 				if (prefix->timer) {
 					/*
 					 * If the prefix has been invalidated,
 					 * make it available again.
 					 */
 					update_prefix(prefix);
 					prefixchange = 1;
 				} else if (dflag > 1) {
 					logit(LOG_DEBUG,
 					    "%s: new prefix(%s/%d) "
 					    "added on %s, "
 					    "but it was already in list",
 					    __func__,
 					    inet_ntop(AF_INET6, addr,
 					    (char *)addrbuf, INET6_ADDRSTRLEN),
 					    plen, rai->ifname);
+				}
 				break;
+			}
-			make_prefix(rai, ifindex, addr, plen);
+			add_prefix(rai, ifindex, addr, plen);
 			prefixchange = 1;
 			break;
 		case RTM_DELETE:
 			/* init ifflags because it may have changed */
 			rai->ifflags = if_getflags(ifindex, rai->ifflags);
 			if (sflag)
 				break;
 			addr = get_addr(msg);
 			plen = get_prefixlen(msg);
 			/* sanity check for plen */
 			/* as RFC2373, prefixlen is at least 4 */
 			if (plen < 4 || plen > 127) {
 				logit(LOG_INFO,
 				    "%s: deleted interface route's "
 				    "plen %d is invalid for a prefix",
 				    __func__, plen);
 				break;
+			}
 			prefix = find_prefix(rai, addr, plen);
 			if (prefix == NULL) {
 				if (dflag > 1) {
 					logit(LOG_DEBUG,
 					    "%s: prefix(%s/%d) was "
 					    "deleted on %s, "
 					    "but it was not in list",
 					    __func__,
 					    inet_ntop(AF_INET6, addr,
 					    (char *)addrbuf, INET6_ADDRSTRLEN),
 					    plen, rai->ifname);
+				}
 				break;
+			}
 			invalidate_prefix(prefix);
 			prefixchange = 1;
 			break;
 		case RTM_NEWADDR:
 		case RTM_DELADDR:
 			/* init ifflags because it may have changed */
 			rai->ifflags = if_getflags(ifindex, rai->ifflags);
 			break;
 		case RTM_IFINFO:
 			rai->ifflags = get_ifm_flags(next);
 			break;
 #ifdef RTM_IFANNOUNCE
 		case RTM_IFANNOUNCE:
 			if (get_ifan_what(next) == IFAN_DEPARTURE) {
 				logit(LOG_DEBUG,
 				       "%s: interface %s departed",
 				       __func__, rai->ifname);
 				TAILQ_REMOVE(&ralist, rai, next);
 				if (rai->leaving)
 					free_rainfo(rai->leaving);
 				free_rainfo(rai);
 				continue;
+			}
 			break;
 #endif
 		default:
 			/* should not reach here */
 			if (dflag > 1) {
 				logit(LOG_DEBUG,
 				    "%s: unknown rtmsg %d on %s",
 				    __func__, type,
 				    if_indextoname(ifindex, ifname));
+			}
 			return;
+		}
 		/* check if an interface flag is changed */
 		if ((oldifflags & IFF_UP) != 0 &&	/* UP to DOWN */
 		    (rai->ifflags & IFF_UP) == 0) {
 			logit(LOG_INFO,
 			    "%s: interface %s becomes down. stop timer.",
 			    __func__, rai->ifname);
 			rtadvd_remove_timer(&rai->timer);
 		} else if ((oldifflags & IFF_UP) == 0 && /* DOWN to UP */
 			 (rai->ifflags & IFF_UP) != 0) {
 			logit(LOG_INFO,
 			    "%s: interface %s becomes up. restart timer.",
 			    __func__, rai->ifname);
 			rai->initcounter = 0; /* reset the counter */
 			rai->waiting = 0; /* XXX */
 			ra_timer_reset(rai);
 		} else if (prefixchange && rai->ifflags & IFF_UP) {
 			/*
 			 * An advertised prefix has been added or invalidated.
 			 * Will notice the change in a short delay.
 			 */
 			rai->initcounter = 0;
 			ra_timer_set_short_delay(rai, rai->timer);
+		}
+	}
 	return;
+}
 void
 rtadvd_input(void)
+{
 	ssize_t i;
 	int *hlimp = NULL;
 	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;
 	struct rainfo *rai;
 	/*
 	 * Get message. We reset msg_controllen since the field could
 	 * be modified if we had received a message before setting
 	 * receive options.
 	 */
 	rcvmhdr.msg_controllen = rcvcmsgbuflen;
 	if ((i = prog_recvmsg(sock, &rcvmhdr, 0)) == -1)
 		return;
 	/* We read the buffer first to clear the FD */
 	if (do_die)
 		return;
 	/* extract optional information via Advanced API */
 	for (cm = (struct cmsghdr *)CMSG_FIRSTHDR(&rcvmhdr);
 	     cm;
 	     cm = (struct cmsghdr *)CMSG_NXTHDR(&rcvmhdr, cm)) {
 		if (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));
 			ifindex = pi->ipi6_ifindex;
 			dst = pi->ipi6_addr;
+		}
 		if (cm->cmsg_level == IPPROTO_IPV6 &&
 		    cm->cmsg_type == IPV6_HOPLIMIT &&
 		    cm->cmsg_len == CMSG_LEN(sizeof(int)))
 			hlimp = (int *)CMSG_DATA(cm);
+	}
 	if (ifindex == 0) {
 		logit(LOG_ERR,
 		       "%s: failed to get receiving interface",
 		       __func__);
 		return;
+	}
 	if (hlimp == NULL) {
 		logit(LOG_ERR,
 		       "%s: failed to get receiving hop limit",
 		       __func__);
 		return;
+	}
 	if ((rai = if_indextorainfo(pi->ipi6_ifindex)) == NULL) {
 		if (dflag > 1) {
 			logit(LOG_DEBUG,
 			       "%s: received data for non advertising "
 			       "interface (%s)",
 			       __func__,
 			       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
+		}
 		return;
+	}
 	/*
 	 * If we happen to receive data on an interface which is now down,
 	 * just discard the data.
 	 */
 	if ((rai->ifflags & IFF_UP) == 0) {
 		logit(LOG_INFO,
 		       "%s: received data on a disabled interface (%s)",
 		       __func__,
 		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		return;
+	}
 	if ((size_t)i < sizeof(struct icmp6_hdr)) {
 		logit(LOG_ERR,
 		       "%s: packet size(%zd) is too short",
 		       __func__, i);
 		return;
+	}
 	icp = (struct icmp6_hdr *)rcvmhdr.msg_iov[0].iov_base;
 	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.
 		 */
 		if (*hlimp != 255) {
 			logit(LOG_NOTICE,
 			    "%s: RS with invalid hop limit(%d) "
 			    "received from %s on %s",
 			    __func__, *hlimp,
 			    inet_ntop(AF_INET6, &rcvfrom.sin6_addr, ntopbuf,
 			    INET6_ADDRSTRLEN),
 			    if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 			return;
+		}
 		if (icp->icmp6_code) {
 			logit(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 ((size_t)i < sizeof(struct nd_router_solicit)) {
 			logit(LOG_NOTICE,
 			    "%s: RS from %s on %s does not have enough "
 			    "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...
 		 */
 		if (*hlimp != 255) {
 			logit(LOG_NOTICE,
 			    "%s: RA with invalid hop limit(%d) "
 			    "received from %s on %s",
 			    __func__, *hlimp,
 			    inet_ntop(AF_INET6, &rcvfrom.sin6_addr, ntopbuf,
 			    INET6_ADDRSTRLEN),
 			    if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 			return;
+		}
 		if (icp->icmp6_code) {
 			logit(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 ((size_t)i < sizeof(struct nd_router_advert)) {
 			logit(LOG_NOTICE,
 			    "%s: RA from %s on %s does not have enough "
 			    "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;
 	default:
 		/*
 		 * Note that this case is POSSIBLE, especially just
 		 * after invocation of the daemon. This is because we
 		 * could receive message after opening the socket and
 		 * before setting ICMP6 type filter(see sock_open()).
 		 */
 		logit(LOG_ERR, "%s: invalid icmp type(%d)",
 		    __func__, icp->icmp6_type);
 		return;
+	}
+}
 static void
 rs_input(int len, struct nd_router_solicit *rs,
 	 struct in6_pktinfo *pi, struct sockaddr_in6 *from)
+{
 	char ntopbuf[INET6_ADDRSTRLEN], ifnamebuf[IFNAMSIZ];
 	union nd_opts ndopts;
 	struct rainfo *rai;
 	struct soliciter *sol;
 	logit(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)) {
 		logit(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;
+	}
 	/*
 	 * If the IP source address is the unspecified address, there
 	 * 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) {
 		logit(LOG_INFO,
 		       "%s: RS from unspecified src on %s has a link-layer"
 		       " address option",
 		       __func__,
 		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		goto done;
+	}
 	if ((rai = if_indextorainfo(pi->ipi6_ifindex)) == NULL) {
 		logit(LOG_INFO,
 		       "%s: RS received on non advertising interface(%s)",
 		       __func__,
 		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		goto done;
+	}
 	if (rai->leaving) {
 		logit(LOG_INFO,
 		       "%s: RS received on reconfiguring advertising interface(%s)",
 		       __func__, rai->ifname);
 		goto done;
+	}
 	rai->rsinput++;		/* increment statistics */
 	/*
 	 * Decide whether to send RA according to the rate-limit
 	 * consideration.
 	 */
 	/* record sockaddr waiting for RA, if possible */
 	TAILQ_FOREACH(sol, &rai->soliciter, next) {
 		if (IN6_ARE_ADDR_EQUAL(&sol->addr.sin6_addr, &from->sin6_addr))
 			break;
+	}
 	if (sol == NULL) {
 		sol = malloc(sizeof(*sol));
 		if (sol == NULL) {
 			logit(LOG_ERR, "%s: malloc: %m", __func__);
 		} else {
 			sol->addr = *from;
 			/* XXX RFC2553 need clarification on flowinfo */
 			sol->addr.sin6_flowinfo = 0;
 			TAILQ_INSERT_TAIL(&rai->soliciter, sol, next);
+		}
+	}
 	/*
 	 * If there is already a waiting RS packet, don't
 	 * update the timer.
 	 */
 	if (rai->waiting++)
 		goto done;
 	ra_timer_set_short_delay(rai, rai->timer_sol);
 done:
 	free_ndopts(&ndopts);
+}
 void
 ra_timer_set_short_delay(struct rainfo *rai, struct rtadvd_timer *timer)
+{
 	long delay;	/* must not be greater than 1000000 */
 	struct timespec 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;
 	interval.tv_nsec = delay;
 	rest = rtadvd_timer_rest(rai->timer);
 	if (timespeccmp(rest, &interval, <)) {
 		logit(LOG_DEBUG, "%s: random delay is larger than "
 		    "the rest of current timer", __func__);
 		interval = *rest;
+	}
 	/*
 	 * If we sent a multicast Router Advertisement within
 	 * the last MIN_DELAY_BETWEEN_RAS seconds, schedule
 	 * the advertisement to be sent at a time corresponding to
 	 * MIN_DELAY_BETWEEN_RAS plus the random value after the
 	 * previous advertisement was sent.
 	 */
 	prog_clock_gettime(CLOCK_MONOTONIC, &now);
 	timespecsub(&now, &rai->lastsent, &tm_tmp);
 	min_delay.tv_sec = MIN_DELAY_BETWEEN_RAS;
 	min_delay.tv_nsec = 0;
 	if (timespeccmp(&tm_tmp, &min_delay, <)) {
 		timespecsub(&min_delay, &tm_tmp, &min_delay);
 		timespecadd(&min_delay, &interval, &interval);
+	}
 	rtadvd_set_timer(&interval, 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;
 	const char *on_off[] = {"OFF", "ON"};
 	uint32_t reachabletime, retranstimer, mtu;
 	struct nd_optlist *optp;
 	int inconsistent = 0;
 	logit(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),
 	    &ndopts, NDOPT_FLAG_SRCLINKADDR |
 	    NDOPT_FLAG_PREFIXINFO | NDOPT_FLAG_MTU |
 	    NDOPT_FLAG_RDNSS | NDOPT_FLAG_DNSSL))
+	{
 		logit(LOG_INFO,
 		    "%s: ND option check failed for an RA from %s on %s",
 		    __func__,
 		    inet_ntop(AF_INET6, &from->sin6_addr,
 		        ntopbuf, INET6_ADDRSTRLEN),
 		        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) {
 		logit(LOG_INFO,
 		       "%s: received RA from %s on non-advertising"
 		       " interface(%s)",
 		       __func__,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       if_indextoname(pi->ipi6_ifindex, ifnamebuf));
 		goto done;
+	}
 	if (rai->leaving) {
 		logit(LOG_DEBUG,
 		       "%s: received RA on re-configuring interface (%s)",
 			__func__, rai->ifname);
 		goto done;
+	}
 	rai->rainput++;		/* increment statistics */
 	/* Cur Hop Limit value */
 	if (ra->nd_ra_curhoplimit && rai->hoplimit &&
 	    ra->nd_ra_curhoplimit != rai->hoplimit) {
 		logit(LOG_INFO,
 		       "%s: CurHopLimit inconsistent on %s:"
 		       " %d from %s, %d from us",
 		       __func__,
 		       rai->ifname,
 		       ra->nd_ra_curhoplimit,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       rai->hoplimit);
 		inconsistent++;
+	}
 	/* M flag */
 	if ((ra->nd_ra_flags_reserved & ND_RA_FLAG_MANAGED) !=
 	    rai->managedflg) {
 		logit(LOG_INFO,
 		       "%s: M flag inconsistent on %s:"
 		       " %s from %s, %s from us",
 		       __func__,
 		       rai->ifname,
 		       on_off[!rai->managedflg],
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       on_off[rai->managedflg]);
 		inconsistent++;
+	}
 	/* O flag */
 	if ((ra->nd_ra_flags_reserved & ND_RA_FLAG_OTHER) !=
 	    rai->otherflg) {
 		logit(LOG_INFO,
 		       "%s: O flag inconsistent on %s:"
 		       " %s from %s, %s from us",
 		       __func__,
 		       rai->ifname,
 		       on_off[!rai->otherflg],
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       on_off[rai->otherflg]);
 		inconsistent++;
+	}
 	/* Reachable Time */
 	reachabletime = ntohl(ra->nd_ra_reachable);
 	if (reachabletime && rai->reachabletime &&
 	    reachabletime != rai->reachabletime) {
 		logit(LOG_INFO,
 		       "%s: ReachableTime inconsistent on %s:"
 		       " %d from %s, %d from us",
 		       __func__,
 		       rai->ifname,
 		       reachabletime,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       rai->reachabletime);
 		inconsistent++;
+	}
 	/* Retrans Timer */
 	retranstimer = ntohl(ra->nd_ra_retransmit);
 	if (retranstimer && rai->retranstimer &&
 	    retranstimer != rai->retranstimer) {
 		logit(LOG_INFO,
 		       "%s: RetranceTimer inconsistent on %s:"
 		       " %d from %s, %d from us",
 		       __func__,
 		       rai->ifname,
 		       retranstimer,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       rai->retranstimer);
 		inconsistent++;
+	}
 	/* Values in the MTU options */
 	if (ndopts.nd_opts_mtu) {
 		mtu = ntohl(ndopts.nd_opts_mtu->nd_opt_mtu_mtu);
 		if (mtu && rai->linkmtu && mtu != rai->linkmtu) {
 			logit(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)
 		if (prefix_check(ndopts.nd_opts_pi, rai, from))
 			inconsistent++;
 	TAILQ_FOREACH(optp, &ndopts.nd_opts_list, next)
 		if (prefix_check((struct nd_opt_prefix_info *)optp->opt,
 		    rai, from))
 			inconsistent++;
 	if (inconsistent)
 		rai->rainconsistent++;
 done:
 	free_ndopts(&ndopts);
+}
 /* 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)
+{
 	uint32_t preferred_time, valid_time;
 	struct prefix *pp;
 	int inconsistent = 0;
 	char ntopbuf[INET6_ADDRSTRLEN], prefixbuf[INET6_ADDRSTRLEN];
 	struct timespec now;
 	struct in6_addr prefix;
 #if 0				/* impossible */
 	if (pinfo->nd_opt_pi_type != ND_OPT_PREFIX_INFORMATION)
 		return 0;
 #endif
 	memcpy(&prefix, &pinfo->nd_opt_pi_prefix, sizeof(prefix));
 	/*
 	 * log if the adveritsed prefix has link-local scope(sanity check?)
 	 */
 	if (IN6_IS_ADDR_LINKLOCAL(&prefix)) {
 		logit(LOG_INFO,
 		       "%s: link-local prefix %s/%d is advertised "
 		       "from %s on %s",
 		       __func__,
 		       inet_ntop(AF_INET6, &prefix,
 				 prefixbuf, INET6_ADDRSTRLEN),
 		       pinfo->nd_opt_pi_prefix_len,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       rai->ifname);
+	}
 	if ((pp = find_prefix(rai, &prefix,
 			      pinfo->nd_opt_pi_prefix_len)) == NULL) {
 		logit(LOG_INFO,
 		       "%s: prefix %s/%d from %s on %s is not in our list",
 		       __func__,
 		       inet_ntop(AF_INET6, &prefix,
 				 prefixbuf, INET6_ADDRSTRLEN),
 		       pinfo->nd_opt_pi_prefix_len,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       rai->ifname);
 		return 0;
+	}
 	preferred_time = ntohl(pinfo->nd_opt_pi_preferred_time);
 	if (pp->pltimeexpire) {
 		/*
 		 * The lifetime is decremented in real time, so we should
 		 * compare the expiration time.
 		 * (RFC 2461 Section 6.2.7.)
 		 * XXX: can we really expect that all routers on the link
 		 * have synchronized clocks?
 		 */
 		prog_clock_gettime(CLOCK_MONOTONIC, &now);
 		preferred_time += now.tv_sec;
 		if (!pp->timer && rai->clockskew &&
 		    llabs((long long)preferred_time - pp->pltimeexpire) > rai->clockskew) {
 			logit(LOG_INFO,
 			       "%s: preferred lifetime for %s/%d"
 			       " (decr. in real time) inconsistent on %s:"
 			       " %d from %s, %ld from us",
 			       __func__,
 			       inet_ntop(AF_INET6, &prefix,
 					 prefixbuf, INET6_ADDRSTRLEN),
 			       pinfo->nd_opt_pi_prefix_len,
 			       rai->ifname, preferred_time,
 			       inet_ntop(AF_INET6, &from->sin6_addr,
 					 ntopbuf, INET6_ADDRSTRLEN),
 			       pp->pltimeexpire);
 			inconsistent++;
+		}
 	} else if (!pp->timer && preferred_time != pp->preflifetime) {
 		logit(LOG_INFO,
 		       "%s: preferred lifetime for %s/%d"
 		       " inconsistent on %s:"
 		       " %d from %s, %d from us",
 		       __func__,
 		       inet_ntop(AF_INET6, &prefix,
 				 prefixbuf, INET6_ADDRSTRLEN),
 		       pinfo->nd_opt_pi_prefix_len,
 		       rai->ifname, preferred_time,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 ntopbuf, INET6_ADDRSTRLEN),
 		       pp->preflifetime);
+	}
 	valid_time = ntohl(pinfo->nd_opt_pi_valid_time);
 	if (pp->vltimeexpire) {
 		prog_clock_gettime(CLOCK_MONOTONIC, &now);
 		valid_time += now.tv_sec;
 		if (!pp->timer && rai->clockskew &&
 		    llabs((long long)valid_time - pp->vltimeexpire) > rai->clockskew) {
 			logit(LOG_INFO,
 			       "%s: valid lifetime for %s/%d"
 			       " (decr. in real time) inconsistent on %s:"
 			       " %d from %s, %ld from us",
 			       __func__,
 			       inet_ntop(AF_INET6, &prefix,
 					 prefixbuf, INET6_ADDRSTRLEN),
 			       pinfo->nd_opt_pi_prefix_len,
 			       rai->ifname, preferred_time,
 			       inet_ntop(AF_INET6, &from->sin6_addr,
 					 ntopbuf, INET6_ADDRSTRLEN),
 			       pp->vltimeexpire);
 			inconsistent++;
+		}
 	} else if (!pp->timer && valid_time != pp->validlifetime) {
 		logit(LOG_INFO,
 		       "%s: valid lifetime for %s/%d"
 		       " inconsistent on %s:"
 		       " %d from %s, %d from us",
 		       __func__,
 		       inet_ntop(AF_INET6, &prefix,
 				 prefixbuf, INET6_ADDRSTRLEN),
 		       pinfo->nd_opt_pi_prefix_len,
 		       rai->ifname, valid_time,
 		       inet_ntop(AF_INET6, &from->sin6_addr,
 				 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;
 	unsigned char bitmask;
 	TAILQ_FOREACH(pp, &rai->prefix, next) {
 		if (plen != pp->prefixlen)
 			continue;
 		bytelen = plen / 8;
 		bitlen = plen % 8;
 		bitmask = 0xff << (8 - bitlen);
 		if (memcmp(prefix, &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;
 	unsigned char bitmask;
 	if (plen0 < plen1)
 		return 0;
 	bytelen = plen1 / 8;
 	bitlen = plen1 % 8;
 	bitmask = 0xff << (8 - bitlen);
 	if (memcmp(p0, 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, uint32_t optflags)
+{
 	int optlen = 0;
 	for (; limit > 0; limit -= optlen) {
 		if ((size_t)limit < sizeof(struct nd_opt_hdr)) {
 			logit(LOG_INFO, "%s: short option header", __func__);
 			goto bad;
+		}
 		hdr = (struct nd_opt_hdr *)((char *)hdr + optlen);
 		if (hdr->nd_opt_len == 0) {
 			logit(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) {
 			logit(LOG_INFO, "%s: short option", __func__);
 			goto bad;
+		}
 		if (hdr->nd_opt_type > ND_OPT_MTU &&
 		    hdr->nd_opt_type != ND_OPT_RDNSS &&
 		    hdr->nd_opt_type != ND_OPT_DNSSL)
+		{
 			logit(LOG_INFO, "%s: unknown ND option(type %d)",
 			    __func__, hdr->nd_opt_type);
 			continue;
+		}
 		if ((ndopt_flags[hdr->nd_opt_type] & optflags) == 0) {
 			logit(LOG_INFO, "%s: unexpected ND option(type %d)",
 			    __func__, hdr->nd_opt_type);
 			continue;
+		}
 		/*
 		 * Option length check.  Do it here for all fixed-length
 		 * options.
 		 */
 		if ((hdr->nd_opt_type == ND_OPT_MTU &&
 		    (optlen != sizeof(struct nd_opt_mtu))) ||
 		    ((hdr->nd_opt_type == ND_OPT_PREFIX_INFORMATION &&
 		    optlen != sizeof(struct nd_opt_prefix_info))) ||
 		    (hdr->nd_opt_type == ND_OPT_RDNSS &&
 		    ((optlen < (int)sizeof(struct nd_opt_rdnss) ||
 		    (optlen - sizeof(struct nd_opt_rdnss)) % 16 != 0))) ||
 		    (hdr->nd_opt_type == ND_OPT_DNSSL &&
 		    optlen < (int)sizeof(struct nd_opt_dnssl)))
+		{
 			logit(LOG_INFO, "%s: invalid option length",
 			    __func__);
 			continue;
+		}
 		switch (hdr->nd_opt_type) {
 		case ND_OPT_TARGET_LINKADDR:
 		case ND_OPT_REDIRECTED_HEADER:
 		case ND_OPT_RDNSS:
 		case ND_OPT_DNSSL:
 			break;	/* we don't care about these options */
 		case ND_OPT_SOURCE_LINKADDR:
 		case ND_OPT_MTU:
 			if (ndopts->nd_opt_array[hdr->nd_opt_type]) {
 				logit(LOG_INFO,
 				    "%s: duplicated ND option (type = %d)",
 				    __func__, hdr->nd_opt_type);
+			}
 			ndopts->nd_opt_array[hdr->nd_opt_type] = hdr;
 			break;
 		case ND_OPT_PREFIX_INFORMATION:
+		{
 			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) {
 				logit(LOG_ERR, "%s: can't allocate memory",
 				    __func__);
 				goto bad;
+			}
 			pfxlist->opt = hdr;
 			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;
 	while ((opt = TAILQ_FIRST(&ndopts->nd_opts_list)) != NULL) {
 		TAILQ_REMOVE(&ndopts->nd_opts_list, opt, next);
 		free(opt);
+	}
+}
 void
 sock_open(void)
+{
 	struct icmp6_filter filt;
 	struct ipv6_mreq mreq;
 	struct rainfo *ra;
 	int on;
 	/* XXX: should be max MTU attached to the node */
 	static unsigned char answer[1500];
 	rcvcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo)) +
 				CMSG_SPACE(sizeof(int));
 	rcvcmsgbuf = malloc(rcvcmsgbuflen);
 	if (rcvcmsgbuf == NULL) {
 		logit(LOG_ERR, "%s: malloc: %m", __func__);
 		exit(EXIT_FAILURE);
+	}
 	sndcmsgbuflen = CMSG_SPACE(sizeof(struct in6_pktinfo));
 	sndcmsgbuf = malloc(sndcmsgbuflen);
 	if (sndcmsgbuf == NULL) {
 		logit(LOG_ERR, "%s: malloc: %m", __func__);
 		exit(EXIT_FAILURE);
+	}
 	if ((sock = prog_socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) == -1) {
 		logit(LOG_ERR, "%s: socket: %m", __func__);
 		exit(EXIT_FAILURE);
+	}
 	/* RFC 4861 Section 4.2 */
 	on = 255;
 	if (prog_setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &on,
 		       sizeof(on)) == -1) {
 		logit(LOG_ERR, "%s: IPV6_MULTICAST_HOPS: %m", __func__);
 		exit(EXIT_FAILURE);
+	}
 	on = 255;
 	if (prog_setsockopt(sock, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &on,
 		       sizeof(on)) == -1) {
 		logit(LOG_ERR, "%s: IPV6_UNICAST_HOPS: %m", __func__);
 		exit(EXIT_FAILURE);
+	}
 	/* specify to tell receiving interface */
 	on = 1;
 	if (prog_setsockopt(sock, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on,
 		       sizeof(on)) == -1) {
 		logit(LOG_ERR, "%s: IPV6_RECVPKTINFO: %m", __func__);
 		exit(EXIT_FAILURE);
+	}
 	on = 1;
 	/* specify to tell value of hoplimit field of received IP6 hdr */
 	if (prog_setsockopt(sock, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &on,
 		       sizeof(on)) == -1) {
 		logit(LOG_ERR, "%s: IPV6_RECVHOPLIMIT: %m", __func__);
 		exit(EXIT_FAILURE);
+	}
 	ICMP6_FILTER_SETBLOCKALL(&filt);
 	ICMP6_FILTER_SETPASS(ND_ROUTER_SOLICIT, &filt);
 	ICMP6_FILTER_SETPASS(ND_ROUTER_ADVERT, &filt);
 	if (prog_setsockopt(sock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt,
 		       sizeof(filt)) == -1) {
 		logit(LOG_ERR, "%s: IICMP6_FILTER: %m", __func__);
 		exit(EXIT_FAILURE);
+	}
 	/*
 	 * join all routers multicast address on each advertising interface.
 	 */
 	if (inet_pton(AF_INET6, ALLROUTERS_LINK,
 	    mreq.ipv6mr_multiaddr.s6_addr) != 1)
+	{
 		logit(LOG_ERR, "%s: inet_pton failed(library bug?)",
 		    __func__);
 		exit(EXIT_FAILURE);
+	}
 	TAILQ_FOREACH(ra, &ralist, next) {
 		mreq.ipv6mr_interface = ra->ifindex;
 		if (prog_setsockopt(sock, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq,
 			       sizeof(mreq)) == -1) {
 			logit(LOG_ERR, "%s: IPV6_JOIN_GROUP(link) on %s: %m",
 			       __func__, ra->ifname);
 			continue;
+		}
+	}
 	/* initialize msghdr for receiving packets */
 	rcviov[0].iov_base = answer;
 	rcviov[0].iov_len = sizeof(answer);
 	rcvmhdr.msg_name = &rcvfrom;
 	rcvmhdr.msg_namelen = sizeof(rcvfrom);
 	rcvmhdr.msg_iov = rcviov;
 	rcvmhdr.msg_iovlen = 1;
 	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 = sndcmsgbuf;
 	sndmhdr.msg_controllen = sndcmsgbuflen;
+}
 /* open a routing socket to watch the routing table */
 static void
 rtsock_open(void)
+{
 #ifdef RO_MSGFILTER
 	unsigned char msgfilter[] = {
 		RTM_ADD, RTM_DELETE,
 		RTM_NEWADDR, RTM_DELADDR,
 #ifdef RTM_IFANNOUNCE
 		RTM_IFANNOUNCE,
 #endif
 		RTM_IFINFO,
 	};
 #endif
 	if ((rtsock = prog_socket(PF_ROUTE, SOCK_RAW, 0)) == -1) {
 		logit(LOG_ERR, "%s: socket: %m", __func__);
 		exit(EXIT_FAILURE);
+	}
 #ifdef RO_MSGFILTER
 	if (setsockopt(rtsock, PF_ROUTE, RO_MSGFILTER,