 @@ -1,14 +1,14 @@
-#	$NetBSD: 3RDPARTY,v 1.1444.2.16 2018/08/11 14:54:49 martin Exp $
+#	$NetBSD: 3RDPARTY,v 1.1444.2.17 2018/08/25 11:38:19 martin Exp $
+#
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
+#
 # When you make changes to this software, be sure to discuss it with the
 # maintainer and contribute your patches.  Divergence from the official
 # sources is not desirable, and should be avoided as much as possible.
+#
 # When importing, please deal with the RCS IDs in this way:
 #   1. Preserve the RCS IDs in the files by removing the $ signs from
 #      the IDs before you do the import.
 #   2. After the import, add NetBSD RCS IDs to all of the files.
+#
 @@ -324,28 +324,28 @@ Maintainer:	mellon
 Archive Site:	ftp://ftp.isc.org/isc/dhcp/
 Home Page:	http://www.isc.org/software/dhcp/
 Mailing List:	dhcp-server@isc.org
 Mailing List:	dhcp-client@isc.org
 Mailing List:	dhcp-announce@isc.org
 Mailing List:	dhcp-bugs@isc.org
 Responsible:	mellon
 License:	BSD (3-clause)
 Location:	external/bsd/dhcp
 Notes:
 Use the dhcp2netbsd script.
 Package:	dhcpcd
-Version:	7.0.7
+Version:	7.0.8
-Current Vers:	7.0.7
+Current Vers:	7.0.8
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/dhcpcd/
 Home Page:	http://roy.marples.name/projects/dhcpcd/
 Mailing List: 	dhcpcd-discuss@marples.name
 License:	BSD (2-clause)
 Location:	external/bsd/dhcpcd/dist
 Notes:
 Please submit all changes to the author.
 Package:       drm
 Version:       Linux 3.15
 Current Vers:  ?
 Maintainer:    Intel, AMD, Linux kernel developers

 @@ -18,27 +18,27 @@
  * 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.
  */
 #ifndef CONFIG_H
 #define CONFIG_H
 #define PACKAGE			"dhcpcd"
-#define VERSION			"7.0.7"
+#define VERSION			"7.0.8"
 #ifndef CONFIG
 # define CONFIG			SYSCONFDIR "/" PACKAGE ".conf"
 #endif
 #ifndef SCRIPT
 # define SCRIPT			LIBEXECDIR "/" PACKAGE "-run-hooks"
 #endif
 #ifndef DEVDIR
 # define DEVDIR			LIBDIR "/" PACKAGE "/dev"
 #endif
 #ifndef DUID
 # define DUID			DBDIR "/duid"
 #endif

 @@ -76,26 +76,31 @@
 /* We should define a maximum for the NAK exponential backoff */
 #define NAKOFF_MAX              60
 /* Wait N nanoseconds between sending a RELEASE and dropping the address.
  * This gives the kernel enough time to actually send it. */
 #define RELEASE_DELAY_S		0
 #define RELEASE_DELAY_NS	10000000
 #ifndef IPDEFTTL
 #define IPDEFTTL 64 /* RFC1340 */
 #endif
 /* NetBSD-7 has an incomplete IP_PKTINFO implementation. */
 #if defined(__NetBSD_Version__) && __NetBSD_Version__ < 800000000
 #undef IP_PKTINFO
 #endif
 /* Assert the correct structure size for on wire */
 __CTASSERT(sizeof(struct ip)		== 20);
 __CTASSERT(sizeof(struct udphdr)	== 8);
 __CTASSERT(sizeof(struct bootp)		== 300);
 struct dhcp_op {
 	uint8_t value;
 	const char *name;
 };
 static const struct dhcp_op dhcp_ops[] = {
 	{ DHCP_DISCOVER,   "DISCOVER" },
 	{ DHCP_OFFER,      "OFFER" },
 @@ -3257,27 +3262,27 @@ rapidcommit:
 #ifdef ARP
 	dhcp_arp_bind(ifp);
 #else
 	dhcp_bind(ifp);
 #endif
+}
 static void *
 get_udp_data(void *udp, size_t *len)
+{
 	struct bootp_pkt *p;
 	p = (struct bootp_pkt *)udp;
-	*len = ntohs(p->ip.ip_len) - sizeof(p->ip) - sizeof(p->udp);
+	*len = (size_t)ntohs(p->ip.ip_len) - sizeof(p->ip) - sizeof(p->udp);
 	return (char *)udp + offsetof(struct bootp_pkt, bootp);
+}
 static int
 valid_udp_packet(void *data, size_t data_len, struct in_addr *from,
     int noudpcsum)
+{
 	struct bootp_pkt *p;
 	uint16_t bytes;
 	if (data_len < sizeof(p->ip)) {
 		if (from)
 			from->s_addr = INADDR_ANY;

 @@ -767,27 +767,26 @@ dhcp6_makemessage(struct interface *ifp)
 #ifndef SMALL
 				len += sizeof(o) + sizeof(struct dhcp6_pd_addr);
 				if (ap->prefix_exclude_len)
 					len += sizeof(o) + 1 +
 					    (uint8_t)((ap->prefix_exclude_len -
 					    ap->prefix_len - 1) / NBBY) + 1;
 #endif
 			} else
 				len += sizeof(o) + sizeof(struct dhcp6_ia_addr);
+		}
 		/* FALLTHROUGH */
 	case DH6S_INIT:
 		for (l = 0; l < ifo->ia_len; l++) {
 			ifia = &ifo->ia[l];
 			len += sizeof(o) + sizeof(uint32_t); /* IAID */
 			/* IA_TA does not have T1 or T2 timers */
 			if (ifo->ia[l].ia_type != D6_OPTION_IA_TA)
 				len += sizeof(uint32_t) + sizeof(uint32_t);
+		}
 		IA = 1;
 		break;
 	default:
 		IA = 0;
+	}
 	if (state->state == DH6S_DISCOVER &&
 	    !(ifp->ctx->options & DHCPCD_TEST) &&

 @@ -1093,29 +1093,52 @@ if_ifa(struct dhcpcd_ctx *ctx, const str
 #ifdef INET
 	case AF_INET:
 	case 255: /* FIXME: Why 255? */
+	{
 		const struct sockaddr_in *sin;
 		struct in_addr addr, mask, bcast;
 		sin = (const void *)rti_info[RTAX_IFA];
 		addr.s_addr = sin != NULL && sin->sin_family == AF_INET ?
 		    sin->sin_addr.s_addr : INADDR_ANY;
 		sin = (const void *)rti_info[RTAX_NETMASK];
 		mask.s_addr = sin != NULL && sin->sin_family == AF_INET ?
 		    sin->sin_addr.s_addr : INADDR_ANY;
 #if defined(__NetBSD_Version__) && __NetBSD_Version__ < 800000000
 		/* NetBSD-7 and older send an invalid broadcast address.
 		 * So we need to query the actual address to get
 		 * the right one. */
+		{
 			struct in_aliasreq ifra;
 			memset(&ifra, 0, sizeof(ifra));
 			strlcpy(ifra.ifra_name, ifp->name,
 			    sizeof(ifra.ifra_name));
 			ifra.ifra_addr.sin_family = AF_INET;
 			ifra.ifra_addr.sin_len = sizeof(ifra.ifra_addr);
 			ifra.ifra_addr.sin_addr = addr;
 			if (ioctl(ctx->pf_inet_fd, SIOCGIFALIAS, &ifra) == -1) {
 				if (errno != EADDRNOTAVAIL)
 					logerr("%s: SIOCGIFALIAS", __func__);
 				break;
+			}
 			bcast = ifra.ifra_broadaddr.sin_addr;
+		}
 #else
 		sin = (const void *)rti_info[RTAX_BRD];
 		bcast.s_addr = sin != NULL && sin->sin_family == AF_INET ?
 		    sin->sin_addr.s_addr : INADDR_ANY;
 #endif
 #if defined(__FreeBSD__) || defined(__DragonFly__)
 		/* FreeBSD sends RTM_DELADDR for each assigned address
 		 * to an interface just brought down.
 		 * This is wrong, because the address still exists.
 		 * So we need to ignore it.
 		 * Oddly enough this only happens for INET addresses. */
 		if (ifam->ifam_type == RTM_DELADDR) {
 			struct ifreq ifr;
 			struct sockaddr_in *ifr_sin;
 			memset(&ifr, 0, sizeof(ifr));
 			strlcpy(ifr.ifr_name, ifp->name, sizeof(ifr.ifr_name));
 @@ -1124,53 +1147,54 @@ if_ifa(struct dhcpcd_ctx *ctx, const str
 			ifr_sin->sin_addr = addr;
 			if (ioctl(ctx->pf_inet_fd, SIOCGIFADDR, &ifr) == 0) {
 				logwarnx("%s: ignored false RTM_DELADDR for %s",
 				    ifp->name, inet_ntoa(addr));
 				break;
+			}
+		}
 #endif
 #ifndef HAVE_IFAM_ADDRFLAGS
 		if (ifam->ifam_type == RTM_DELADDR)
 			addrflags = 0 ;
 		else if ((addrflags = if_addrflags(ifp, &addr, NULL)) == -1) {
-			logerr("%s: if_addrflags: %s",
+			if (errno != EADDRNOTAVAIL)
-			    ifp->name, inet_ntoa(addr));
+				logerr("%s: if_addrflags", __func__);
 			break;
+		}
 #endif
 		ipv4_handleifa(ctx, ifam->ifam_type, NULL, ifp->name,
 		    &addr, &mask, &bcast, addrflags, pid);
 		break;
+	}
 #endif
 #ifdef INET6
 	case AF_INET6:
+	{
 		struct in6_addr addr6, mask6;
 		const struct sockaddr_in6 *sin6;
 		sin6 = (const void *)rti_info[RTAX_IFA];
 		addr6 = sin6->sin6_addr;
 		sin6 = (const void *)rti_info[RTAX_NETMASK];
 		mask6 = sin6->sin6_addr;
 #ifndef HAVE_IFAM_ADDRFLAGS
 		if (ifam->ifam_type == RTM_DELADDR)
 		    addrflags = 0;
 		else if ((addrflags = if_addrflags6(ifp, &addr6, NULL)) == -1) {
-			logerr("%s: if_addrflags6", ifp->name);
+			if (errno != EADDRNOTAVAIL)
 				logerr("%s: if_addrflags6", __func__);
 			break;
+		}
 #endif
 #ifdef __KAME__
 		if (IN6_IS_ADDR_LINKLOCAL(&addr6))
 			/* Remove the scope from the address */
 			addr6.s6_addr[2] = addr6.s6_addr[3] = '\0';
 #endif
 		ipv6_handleifa(ctx, ifam->ifam_type, NULL,
 		    ifp->name, &addr6, ipv6_prefixlen(&mask6), addrflags, pid);
 		break;

 @@ -230,53 +230,51 @@ if_learnaddrs(struct dhcpcd_ctx *ctx, st
 		switch(ifa->ifa_addr->sa_family) {
 #ifdef INET
 		case AF_INET:
 			addr = (void *)ifa->ifa_addr;
 			net = (void *)ifa->ifa_netmask;
 			if (ifa->ifa_flags & IFF_POINTOPOINT)
 				brd = (void *)ifa->ifa_dstaddr;
 			else
 				brd = (void *)ifa->ifa_broadaddr;
 #ifndef HAVE_IFADDRS_ADDRFLAGS
 			addrflags = if_addrflags(ifp, &addr->sin_addr,
 			    ifa->ifa_name);
 			if (addrflags == -1) {
-				if (errno != EEXIST)
+				if (errno != EEXIST && errno != EADDRNOTAVAIL)
-					logerr("%s: if_addrflags: %s",
+					logerr("%s: if_addrflags", __func__);
 					    __func__,
 					    inet_ntoa(addr->sin_addr));
 				continue;
+			}
 #endif
 			ipv4_handleifa(ctx, RTM_NEWADDR, ifs, ifa->ifa_name,
 				&addr->sin_addr, &net->sin_addr,
 				brd ? &brd->sin_addr : NULL, addrflags, 0);
 			break;
 #endif
 #ifdef INET6
 		case AF_INET6:
 			sin6 = (void *)ifa->ifa_addr;
 			net6 = (void *)ifa->ifa_netmask;
 #ifdef __KAME__
 			if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
 				/* Remove the scope from the address */
 				sin6->sin6_addr.s6_addr[2] =
 				    sin6->sin6_addr.s6_addr[3] = '\0';
 #endif
 #ifndef HAVE_IFADDRS_ADDRFLAGS
 			addrflags = if_addrflags6(ifp, &sin6->sin6_addr,
 			    ifa->ifa_name);
 			if (addrflags == -1) {
-				if (errno != EEXIST)
+				if (errno != EEXIST && errno != EADDRNOTAVAIL)
 					logerr("%s: if_addrflags6", __func__);
 				continue;
+			}
 #endif
 			ipv6_handleifa(ctx, RTM_NEWADDR, ifs,
 			    ifa->ifa_name, &sin6->sin6_addr,
 			    ipv6_prefixlen(&net6->sin6_addr), addrflags, 0);
 			break;
 #endif
+		}
+	}
 	freeifaddrs(*ifaddrs);

 @@ -806,29 +806,37 @@ ipv4_deletestaleaddrs(struct interface *
 void
 ipv4_handleifa(struct dhcpcd_ctx *ctx,
     int cmd, struct if_head *ifs, const char *ifname,
     const struct in_addr *addr, const struct in_addr *mask,
     const struct in_addr *brd, int addrflags, pid_t pid)
+{
 	struct interface *ifp;
 	struct ipv4_state *state;
 	struct ipv4_addr *ia;
 	bool ia_is_new;
 #if 0
-	logdebugx("%s: %s %s/%d %d", ifname,
+	char sbrdbuf[INET_ADDRSTRLEN];
-	    cmd == RTM_NEWADDR ? "RTM_NEWADDR" : cmd == RTM_DELADDR ? "RTM_DELADDR" : "???",
+	const char *sbrd;
 	    inet_ntoa(*addr), inet_ntocidr(*mask), addrflags);
 	if (brd)
 		sbrd = inet_ntop(AF_INET, brd, sbrdbuf, sizeof(sbrdbuf));
 	else
 		sbrd = NULL;
 	logdebugx("%s: %s %s/%d %s %d", ifname,
 	    cmd == RTM_NEWADDR ? "RTM_NEWADDR" :
 	    cmd == RTM_DELADDR ? "RTM_DELADDR" : "???",
 	    inet_ntoa(*addr), inet_ntocidr(*mask), sbrd, addrflags);
 #endif
 	if (ifs == NULL)
 		ifs = ctx->ifaces;
 	if (ifs == NULL) {
 		errno = ESRCH;
 		return;
+	}
 	if ((ifp = if_find(ifs, ifname)) == NULL)
 		return;
 	if ((state = ipv4_getstate(ifp)) == NULL) {
 		errno = ENOENT;
 		return;

 @@ -420,27 +420,27 @@ ipv6_mask(struct in6_addr *mask, int len
 	    { 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff };
 	int bytes, bits, i;
 	if (len < 0 || len > 128) {
 		errno = EINVAL;
 		return -1;
+	}
 	memset(mask, 0, sizeof(*mask));
 	bytes = len / NBBY;
 	bits = len % NBBY;
 	for (i = 0; i < bytes; i++)
 		mask->s6_addr[i] = 0xff;
-	if (bits) {
+	if (bits != 0) {
 		/* Coverify false positive.
 		 * bytelen cannot be 16 if bitlen is non zero */
 		/* coverity[overrun-local] */
 		mask->s6_addr[bytes] = masks[bits - 1];
+	}
 	return 0;
+}
 uint8_t
 ipv6_prefixlen(const struct in6_addr *mask)
+{
 	int x = 0, y;
 	const unsigned char *lim, *p;
 @@ -557,27 +557,28 @@ void
 ipv6_checkaddrflags(void *arg)
+{
 	struct ipv6_addr *ia;
 	int flags;
 	const char *alias;
 	ia = arg;
 #ifdef ALIAS_ADDR
 	alias = ia->alias;
 #else
 	alias = NULL;
 #endif
 	if ((flags = if_addrflags6(ia->iface, &ia->addr, alias)) == -1) {
-		logerr("%s: if_addrflags6", ia->iface->name);
+		if (errno != EEXIST && errno != EADDRNOTAVAIL)
 			logerr("%s: if_addrflags6", __func__);
 		return;
+	}
 	if (!(flags & IN6_IFF_TENTATIVE)) {
 		/* Simulate the kernel announcing the new address. */
 		ipv6_handleifa(ia->iface->ctx, RTM_NEWADDR,
 		    ia->iface->ctx->ifaces, ia->iface->name,
 		    &ia->addr, ia->prefix_len, flags, 0);
 	} else {
 		/* Still tentative? Check again in a bit. */
 		struct timespec tv;
 		ms_to_ts(&tv, RETRANS_TIMER / 2);