Address more review comments

Author: rsmarples

configure

@@ -317,7 +317,7 @@ int main(void) {
 	return 0;
 }
 EOF
-		if $CC -fsanitize=address _test.c -o _test 2>&3; then
+		if $CC -fsanitize=address,undefined _test.c -o _test 2>&3; then
 			echo "yes"
 			echo "SANITIZEADDRESS=	yes" >>$CONFIG_MK
 			echo "CPPFLAGS+=	-DASAN" >>$CONFIG_MK
@@ -614,7 +614,6 @@ fi
 if [ -z "$LINK_SRC" ]; then
 	printf "Testing for netlink ... "
 	cat << EOF >_netlink.c
-#include <asm/types.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <sys/socket.h>

src/netlink.c

@@ -151,8 +151,7 @@ netlink_link(struct link_ctx *lctx, struct nlmsghdr *nlm)
 		loginfox("%s: interface has departed", ifp->if_name);
 	else if (!(ifi->ifi_flags & IFF_UP))
 		loginfox("%s: interface is down", ifp->if_name);
-	else
-		logerrx("%s: interface going away for no reason", ifp->if_name);
+
 	TAILQ_REMOVE(ctx->ctx_ifaces, ifp, if_next);
 	if_free(ifp);
 	return 0;
@@ -179,7 +178,11 @@ netlink_handle(void *arg, unsigned short e)
 		.iov_len = sizeof(buf),
 	};
 
+#ifdef NDEBUG
 	UNUSED(e);
+#else
+	assert(e == ELE_READ);
+#endif
 
 	if (netlink_get(lctx, &iov, lctx->link_fd, MSG_DONTWAIT,
 		netlink_dispatch) == -1)

src/priv.c

@@ -43,7 +43,6 @@
 #include "priv.h"
 #include "queue.h"
 #include "service.h"
-#include "src/eloop.h"
 
 #define P_OPENBPF 1
 #define P_SENDBPF 2

src/route.c

@@ -30,6 +30,7 @@
 #include <net/if.h>
 #include <net/route.h>
 
+#include <assert.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -114,9 +115,12 @@ route_dispatch(void *arg, unsigned short e)
 	struct rtm rtm;
 	ssize_t len;
 
-	if (e != ELE_READ) {
-		logerrx("%s: unexpected event 0x%04x", __func__, e);
-	}
+#ifdef NDEBUG
+	UNUSED(e);
+#else
+	assert(e == ELE_READ);
+#endif
+
 	len = read(lctx->link_fd, &rtm, sizeof(rtm));
 	if (len == -1) {
 		logerr("%s: read", __func__);

src/unpriv.c

@@ -98,10 +98,10 @@ unpriv_getifaddrs(struct srv_ctx *ctx, struct ifaddrs **ifahead,
 	size_t rdata_len, len;
 	int err;
 
-	err = srv_run(ctx, 0, U_GETIFADDRS, match_if_index,
+	err = srv_run(ctx, NULL, U_GETIFADDRS, match_if_index,
 	    match_if_index != NULL ? sizeof(*match_if_index) : 0, &result,
 	    &rdata, &rdata_len);
-	if (err == -1)
+	if (err == -1 || result == -1)
 		return -1;
 
 	/* Should be impossible - lo0 will always exist. */
@@ -258,11 +258,14 @@ unpriv_getaddrinfo(struct srv_ctx *ctx, const char *hostname,
 		u_gai.u_gai_hints.u_ai_protocol = hints->ai_protocol;
 	}
 
-	err = srv_run(ctx, 0, U_GETADDRINFO, &u_gai, sizeof(u_gai), &result,
+	err = srv_run(ctx, NULL, U_GETADDRINFO, &u_gai, sizeof(u_gai), &result,
 	    &rdata, &rdata_len);
 	if (err == -1)
 		return -1;
 
+	if (result != 0)
+		return (int)result;
+
 	for (u_ai = rdata; rdata_len != 0; rdata_len -= sizeof(*u_ai), u_ai++) {
 		if (rdata_len < sizeof(*u_ai)) {
 			logerrx("%s: ai_addrinfo truncated", __func__);