 @@ -1,16 +1,16 @@
-/*	$NetBSD: ifwatchd.c,v 1.44 2020/09/23 02:32:04 roy Exp $	*/
+/*	$NetBSD: ifwatchd.c,v 1.45 2020/09/27 19:55:21 roy Exp $	*/
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ifwatchd.c,v 1.44 2020/09/23 02:32:04 roy Exp $");
+__RCSID("$NetBSD: ifwatchd.c,v 1.45 2020/09/27 19:55:21 roy Exp $");
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Martin Husemann <martin@NetBSD.org>.
+ *
  * 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.
 @@ -29,27 +29,26 @@ __RCSID("$NetBSD: ifwatchd.c,v 1.44 2020
  * 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/types.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <sys/wait.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <arpa/inet.h>
 #include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <netdb.h>
 #include <err.h>
 #include <ifaddrs.h>
 @@ -526,95 +525,61 @@ free_interfaces(void)
+}
 static struct interface_data *
 find_interface(int idx)
+{
 	struct interface_data * p;
 	SLIST_FOREACH(p, &ifs, next)
 		if (p->index == idx)
 			return p;
 	return NULL;
+}
 static bool
 has_carrier(int s, const char *ifname)
 	struct ifmediareq ifmr = { .ifm_status = 0 };
 	strlcpy(ifmr.ifm_name, ifname, sizeof(ifmr.ifm_name));
 	if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1) {
 		struct ifdatareq ifdr = { .ifdr_data.ifi_link_state = 0 };
 		strlcpy(ifdr.ifdr_name, ifname, sizeof(ifdr.ifdr_name));
 		if (ioctl(s, SIOCGIFDATA, &ifdr) == -1) {
 			/* Should not be possible. */
 			return false;
 		if (ifdr.ifdr_data.ifi_link_state == LINK_STATE_UP)
 			return true;
 		else
 			return false;
 	if (!(ifmr.ifm_status & IFM_AVALID)) {
 		/*
 		 * Interface doesn't report media-valid status.
 		 * assume ok.
 		 */
 		return true;
 	if (ifmr.ifm_status & IFM_ACTIVE)
 		return true;
 	else
 		return false;
 static void
 run_initial_ups(void)
+{
 	struct interface_data * ifd;
 	struct ifaddrs *res = NULL, *p;
 	struct sockaddr *ifa;
 	const struct if_data *ifi;
 	int s, aflag;
 	s = socket(AF_INET, SOCK_DGRAM, 0);
 	if (s < 0)
 		return;
 	if (getifaddrs(&res) != 0)
 		goto out;
 	for (p = res; p; p = p->ifa_next) {
 		SLIST_FOREACH(ifd, &ifs, next) {
 			if (strcmp(ifd->ifname, p->ifa_name) == 0)
 				break;
+		}
 		if (ifd == NULL)
 			continue;
 		ifa = p->ifa_addr;
 		if (ifa != NULL && ifa->sa_family == AF_LINK)
 			invoke_script(ifd->ifname, ARRIVAL, NULL, NULL);
 		if ((p->ifa_flags & IFF_UP) == 0)
 			continue;
 		if (ifa == NULL)
 			continue;
 		if (ifa->sa_family == AF_LINK) {
-			if (has_carrier(s, ifd->ifname) == 0) {
+			ifi = (const struct if_data *)p->ifa_data;
 			if (ifi->ifi_link_state == LINK_STATE_UP)
 				invoke_script(ifd->ifname, CARRIER, NULL, NULL);
-				ifd->last_carrier_status =
+			ifd->last_carrier_status = ifi->ifi_link_state;
 				    LINK_STATE_UP;
 			continue;
+		}
 		aflag = check_addrflags(ifa->sa_family, p->ifa_addrflags);
 		if (aflag != READY)
 			continue;
 		invoke_script(ifd->ifname, UP, ifa, p->ifa_dstaddr);
+	}
 	freeifaddrs(res);
 out:
 	close(s);
+}