Actually work on NetBSD

Author: rsmarples

src/dhcp.c

@@ -1303,10 +1303,12 @@ dhcp_handlebootp(struct interface *ifp, struct bootp *bootp, size_t len,
 		wanted = dhcp_lease_findaddr(ctx, &paddr);
 		if (wanted != NULL && !dhcp_lease_avail(lease, wanted, &now)) {
 			logwarnx(
-			    "%s: plugin assigned address unavailable: 0x%x %s",
+			    "%s: plugin assigned address in-use: 0x%x %s",
 			    ifp->if_name, bootp->xid, inet_ntoa(paddr));
+#if 0
 			paddr.s_addr = INADDR_ANY;
 			wanted = NULL;
+#endif
 		}
 		break;
 	}

src/dhcpsd.c

@@ -470,8 +470,6 @@ main(int argc, char **argv)
 		logerr("%s: PF_INET", __func__);
 		goto exit;
 	}
-	if (ctx.ctx_options & DHCPSD_RUN)
-		goto run;
 
 #ifdef IFLR_ACTIVE
 	ctx.ctx_pf_link_fd = xsocket(PF_LINK, SOCK_DGRAM | SOCK_CLOEXEC, 0);
@@ -481,6 +479,9 @@ main(int argc, char **argv)
 	}
 #endif
 
+	if (ctx.ctx_options & DHCPSD_RUN)
+		goto run;
+
 	if (link_open(&ctx) == -1) {
 		logerr("%s: link_open", __func__);
 		goto exit;

src/if.c

@@ -164,14 +164,17 @@ if_sockaddr_active(struct ctx *ctx, const char *if_name,
 {
 #ifdef IFLR_ACTIVE
 	const struct sockaddr_dl *sdl = (const void *)sa;
-	struct if_laddrreq iflr = { .flags = IFLR_PREFIX };
+	struct if_laddrreq iflr = {
+		.flags = IFLR_PREFIX,
+		.prefixlen = (unsigned int)sdl->sdl_alen * NBBY,
+	};
 
 	strlcpy(iflr.iflr_name, if_name, sizeof(iflr.iflr_name));
 	memcpy(&iflr.addr, sa, MIN(sa->sa_len, sizeof(iflr.addr)));
-	iflr.flags = IFLR_PREFIX;
-	iflr.prefixlen = (unsigned int)sdl->sdl_alen * NBBY;
-	if (ioctl(ctx->ctx_pf_link_fd, SIOCGLIFADDR, &iflr) == -1 ||
-	    !(iflr.flags & IFLR_ACTIVE))
+
+	if (ioctl(ctx->ctx_pf_link_fd, SIOCGLIFADDR, &iflr) == -1)
+		return 0;
+	if (!(iflr.flags & IFLR_ACTIVE))
 		return 0;
 #else
 	UNUSED(ctx);
@@ -330,7 +333,8 @@ if_findifpfromcmsg(struct ctx *ctx, struct msghdr *msg, void *to)
 
 		if (unpriv_learnif(ifp) == -1) {
 			logerr("%s: unpriv_learnif", __func__);
-			if_free(ifp);
+			/* Avoid neededless checks */
+			free(ifp);
 			return NULL;
 		}
 
@@ -345,7 +349,7 @@ if_findifpfromcmsg(struct ctx *ctx, struct msghdr *msg, void *to)
 			}
 		}
 		if (ifp->if_flags & IF_ACTIVE) {
-			loginfox("%s: activated interface (%d)", ifp->if_name,
+			logdebugx("%s: activated interface (%d)", ifp->if_name,
 			    ifp->if_index);
 			if (dhcpsd_configure_pools(ifp) == -1) {
 				logerr("%s: dhcpsd_configure_pools",

src/netlink.c

@@ -149,7 +149,7 @@ netlink_link(struct link_ctx *lctx, struct nlmsghdr *nlm)
 		return 0;
 
 	if (nlm->nlmsg_type == RTM_DELLINK)
-		loginfox("%s: interface departed", ifp->if_name);
+		loginfox("%s: interface has departed", ifp->if_name);
 	else if (!(ifi->ifi_flags & IFF_UP))
 		loginfox("%s: interface is down", ifp->if_name);
 	else

src/route.c

@@ -30,6 +30,7 @@
 #include <net/if.h>
 #include <net/route.h>
 
+#include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -77,6 +78,34 @@ route_dispatch_ifinfo(struct link_ctx *lctx, struct rt_msghdr *rtm)
 	if_free(ifp);
 }
 
+#ifdef RTM_IFANNOUNCE
+static void
+route_dispatch_ifannounce(struct link_ctx *lctx, const struct rt_msghdr *rtm) 
+{
+	struct ctx *ctx = lctx->link_ctx;
+	const struct if_announcemsghdr *ifan = (const struct if_announcemsghdr *)rtm;
+	struct interface *ifp;
+
+	if (rtm->rtm_msglen < sizeof(*ifan))
+		return;
+
+	if (ifan->ifan_what != IFAN_DEPARTURE)
+		return;
+
+	/* Interface has departed, remove it from consideration. */
+	TAILQ_FOREACH(ifp, ctx->ctx_ifaces, if_next) {
+		if (ifp->if_index == ifan->ifan_index)
+			break;
+	}
+	if (ifp == NULL)
+		return;
+
+	logwarnx("%s: interface has departed", ifp->if_name);
+	TAILQ_REMOVE(ctx->ctx_ifaces, ifp, if_next);
+	if_free(ifp);
+}
+#endif
+
 static void
 route_dispatch(void *arg, unsigned short e)
 {
@@ -105,6 +134,11 @@ route_dispatch(void *arg, unsigned short e)
 	case RTM_IFINFO:
 		route_dispatch_ifinfo(lctx, &rtm.hdr);
 		break;
+#ifdef RTM_IFANNOUNCE
+	case RTM_IFANNOUNCE:
+		route_dispatch_ifannounce(lctx, &rtm.hdr);
+		break;
+#endif
 	default:
 		/* Ignore other messages */
 		break;
@@ -185,4 +219,4 @@ link_free(struct ctx *ctx)
 		close(lctx->link_fd);
 	free(lctx);
 	ctx->ctx_link = NULL;
-}
+}