Adjust for new eloop.

Needs more testing.

Author: rsmarples

.clangd

@@ -1,4 +1,12 @@
+If:
+  PathMatch: src/dev/.*\.c
+CompileFlags:
+  Add: [-I.., -I../.., -I../../compat]
+---
 If:
   PathMatch: src/.*\.c
 CompileFlags:
-  Add: [-I., -I.., -I../compat]
+  Add: [-I.., -I../compat]
+---
+CompileFlags:
+  Add: [-DINET, -DARP, -DARPING, -DIPV4LL, -DINET6, -DDHCP6, -DPLUGIN_DEV, -DAUTH, -DPRIVSEP]

configure

@@ -1249,89 +1249,6 @@ fi
 # Set this for eloop
 echo "#define	HAVE_REALLOCARRAY" >>$CONFIG_H
 
-# Detect a polling mechanism.
-# See src/eloop.c as to why we only detect ppoll, pollts and pselect and
-# not others like epoll or kqueue.
-if [ -z "$POLL" ]; then
-	printf "Testing for ppoll ... "
-	cat <<EOF >_ppoll.c
-#include <poll.h>
-#include <stddef.h>
-int main(void) {
-	struct pollfd fds;
-	return ppoll(&fds, 1, NULL, NULL);
-}
-EOF
-	if $XCC _ppoll.c -o _ppoll 2>&3; then
-		POLL=ppoll
-		echo "yes"
-	else
-		echo "no"
-	fi
-	rm -f _ppoll.c _ppoll
-fi
-if [ -z "$POLL" ]; then
-	printf "Testing for pollts ... "
-	cat <<EOF >_pollts.c
-#include <poll.h>
-#include <stddef.h>
-int main(void) {
-	struct pollfd fds;
-	return pollts(&fds, 1, NULL, NULL);
-}
-EOF
-	if $XCC _pollts.c -o _pollts 2>&3; then
-		POLL=pollts
-		echo "yes"
-	else
-		echo "no"
-	fi
-	rm -f _pollts.c _pollts
-fi
-if [ -z "$POLL" ]; then
-	printf "Testing for pselect ... "
-	cat <<EOF >_pselect.c
-#include <sys/select.h>
-#include <stdlib.h>
-int main(void) {
-	return pselect(0, NULL, NULL, NULL, NULL, NULL);
-}
-EOF
-	if $XCC _pselect.c -o _pselect 2>&3; then
-		POLL=pselect
-		echo "yes"
-	else
-		echo "no"
-	fi
-	rm -f _pselect.c _pselect
-fi
-case "$POLL" in
-kqueue1)
-	echo "#define	HAVE_KQUEUE" >>$CONFIG_H
-	echo "#define	HAVE_KQUEUE1" >>$CONFIG_H
-	POLL=kqueue
-	;;
-kqueue)
-	echo "#define	HAVE_KQUEUE" >>$CONFIG_H
-	;;
-epoll)
-	echo "#define	HAVE_EPOLL" >>$CONFIG_H
-	;;
-ppoll)
-	echo "#define	HAVE_PPOLL" >>$CONFIG_H
-	;;
-pollts)
-	echo "#define	HAVE_POLLTS" >>$CONFIG_H
-	;;
-pselect)
-	echo "#define	HAVE_PSELECT" >>$CONFIG_H
-	;;
-*)
-	echo "No suitable polling function is available, not even pselect" >&2
-	exit 1
-	;;
-esac
-
 if [ -z "$BE64ENC" ]; then
 	printf "Testing for be64enc ... "
 	cat <<EOF >_be64enc.c

src/dhcpcd.c

@@ -1450,8 +1450,9 @@ dhcpcd_signal_cb(int sig, void *arg)
 		return;
 	}
 
-	if (sig != SIGCHLD && ctx->options & DHCPCD_FORKED) {
-		if (sig != SIGHUP &&
+	if (sig != SIGCHLD && ctx->options & DHCPCD_FORKED)
+	{
+		if (ctx->fork_fd != -1 && sig != SIGHUP &&
 		    send(ctx->fork_fd, &sig, sizeof(sig), MSG_EOR) == -1)
 			logerr("%s: send", __func__);
 		return;
@@ -2243,7 +2244,7 @@ main(int argc, char **argv, char **envp)
 	eloop_signal_set_cb(ctx.eloop,
 	    dhcpcd_signals, dhcpcd_signals_len,
 	    dhcpcd_signal_cb, &ctx);
-	if (eloop_signal_mask(ctx.eloop, &ctx.sigset) == -1) {
+	if (eloop_signal_mask(ctx.eloop) == -1) {
 		logerr("%s: eloop_signal_mask", __func__);
 		goto exit_failure;
 	}
@@ -2408,6 +2409,7 @@ main(int argc, char **argv, char **envp)
 		logerr("socketpair");
 		goto exit_failure;
 	}
+
 	switch (pid = fork()) {
 	case -1:
 		logerr("fork");
@@ -2421,23 +2423,33 @@ main(int argc, char **argv, char **envp)
 			goto exit_failure;
 		}
 #endif
-		if (eloop_event_add(ctx.eloop, ctx.fork_fd, ELE_READ,
-		    dhcpcd_fork_cb, &ctx) == -1)
-			logerr("%s: eloop_event_add", __func__);
-
 		if (setsid() == -1) {
 			logerr("%s: setsid", __func__);
 			goto exit_failure;
 		}
 		/* Ensure we can never get a controlling terminal */
-		switch (pid = fork()) {
-		case -1:
+		pid = fork();
+		if (pid == -1) {
 			logerr("fork");
 			goto exit_failure;
-		case 0:
-			eloop_forked(ctx.eloop);
-			break;
-		default:
+		}
+		/* setsid again to ensure our child processes have the
+		 * correct ppid */
+		if (pid == 0 && setsid() == -1) {
+			logerr("%s: setsid", __func__);
+			goto exit_failure;
+		}
+		if (eloop_forked(ctx.eloop, ELF_KEEP_ALL) == -1) {
+			logerr("%s: eloop_forked", __func__);
+			goto exit_failure;
+		}
+		if (eloop_event_add(ctx.eloop, ctx.fork_fd, ELE_READ,
+		    dhcpcd_fork_cb, &ctx) == -1)
+		{
+			logerr("%s: eloop_event_add", __func__);
+			goto exit_failure;
+		}
+		if (pid != 0) {
 			ctx.options |= DHCPCD_FORKED; /* A lie */
 			i = EXIT_SUCCESS;
 			goto exit1;
@@ -2651,7 +2663,7 @@ main(int argc, char **argv, char **envp)
 	}
 
 run_loop:
-	i = eloop_start(ctx.eloop, &ctx.sigset);
+	i = eloop_start(ctx.eloop);
 	if (i < 0) {
 		logerr("%s: eloop_start", __func__);
 		goto exit_failure;

src/dhcpcd.h

@@ -156,9 +156,6 @@ struct dhcpcd_ctx {
 	int seq;	/* route message sequence no */
 	int sseq;	/* successful seq no sent */
 
-#ifdef USE_SIGNALS
-	sigset_t sigset;
-#endif
 	struct eloop *eloop;
 
 	char *script;

src/privsep-bpf.c

@@ -259,7 +259,8 @@ ps_bpf_cmd(struct dhcpcd_ctx *ctx, struct ps_msghdr *psm, struct msghdr *msg)
 	    addr != NULL ? " " : "", addr != NULL ? addr : "");
 
 	start = ps_startprocess(psp, ps_bpf_recvmsg, NULL,
-	    ps_bpf_start_bpf, NULL, PSF_DROPPRIVS);
+	    ps_bpf_start_bpf, PSF_DROPPRIVS);
+
 	switch (start) {
 	case -1:
 		ps_freeprocess(psp);

src/privsep-control.c

@@ -236,7 +236,7 @@ ps_ctl_start(struct dhcpcd_ctx *ctx)
 	psp = ctx->ps_ctl = ps_newprocess(ctx, &id);
 	strlcpy(psp->psp_name, "control proxy", sizeof(psp->psp_name));
 	pid = ps_startprocess(psp, ps_ctl_recvmsg, ps_ctl_dodispatch,
-	    ps_ctl_startcb, NULL, PSF_DROPPRIVS);
+	    ps_ctl_startcb, PSF_DROPPRIVS);
 
 	if (pid == -1)
 		return -1;

src/privsep-inet.c

@@ -370,7 +370,7 @@ ps_inet_start(struct dhcpcd_ctx *ctx)
 
 	strlcpy(psp->psp_name, "network proxy", sizeof(psp->psp_name));
 	pid = ps_startprocess(psp, ps_inet_recvmsg, ps_inet_dodispatch,
-	    ps_inet_startcb, NULL, PSF_DROPPRIVS);
+	    ps_inet_startcb, PSF_DROPPRIVS);
 
 	if (pid == 0)
 		ps_entersandbox("stdio", NULL);
@@ -594,7 +594,7 @@ ps_inet_cmd(struct dhcpcd_ctx *ctx, struct ps_msghdr *psm, struct msghdr *msg)
 	    "%s proxy %s", psp->psp_protostr,
 	    inet_ntop(psa->psa_family, ia, buf, sizeof(buf)));
 	start = ps_startprocess(psp, ps_inet_recvmsgpsp, NULL,
-	    start_func, NULL, PSF_DROPPRIVS);
+	    start_func, PSF_DROPPRIVS);
 	switch (start) {
 	case -1:
 		ps_freeprocess(psp);

src/privsep-root.c

@@ -87,6 +87,9 @@ ps_root_readerrorcb(void *arg, unsigned short events)
 	ssize_t len;
 	int exit_code = EXIT_FAILURE;
 
+	if (events & ELE_HANGUP)
+		goto out;
+
 	if (events != ELE_READ)
 		logerrx("%s: unexpected event 0x%04x", __func__, events);
 
@@ -111,22 +114,17 @@ ps_root_readerrorcb(void *arg, unsigned short events)
 ssize_t
 ps_root_readerror(struct dhcpcd_ctx *ctx, void *data, size_t len)
 {
-	struct psr_ctx psr_ctx = {
-	    .psr_ctx = ctx,
-	    .psr_data = data, .psr_datalen = len,
-	};
-	int fd = PS_ROOT_FD(ctx);
+	struct psr_ctx *pc = ctx->ps_root->psp_data;
+	int err;
 
-	if (eloop_event_add(ctx->ps_eloop, fd, ELE_READ,
-	    ps_root_readerrorcb, &psr_ctx) == -1)
-		return -1;
-
-	eloop_enter(ctx->ps_eloop);
-	eloop_start(ctx->ps_eloop, &ctx->sigset);
-	eloop_event_delete(ctx->ps_eloop, fd);
+	pc->psr_data = data;
+	pc->psr_datalen = len;
+	err = eloop_start(ctx->ps_eloop);
+	if (err < 0)
+		return err;
 
-	errno = psr_ctx.psr_error.psr_errno;
-	return psr_ctx.psr_error.psr_result;
+	errno = pc->psr_error.psr_errno;
+	return pc->psr_error.psr_result;
 }
 
 #ifdef PRIVSEP_GETIFADDRS
@@ -180,15 +178,15 @@ ps_root_mreaderror(struct dhcpcd_ctx *ctx, void **data, size_t *len)
 	struct psr_ctx psr_ctx = {
 	    .psr_ctx = ctx,
 	};
-	int fd = PS_ROOT_FD(ctx);
+	int fd = PS_ROOT_FD(ctx), err;
 
 	if (eloop_event_add(ctx->ps_eloop, fd, ELE_READ,
 	    ps_root_mreaderrorcb, &psr_ctx) == -1)
 		return -1;
 
-	eloop_enter(ctx->ps_eloop);
-	eloop_start(ctx->ps_eloop, &ctx->sigset);
-	eloop_event_delete(ctx->ps_eloop, fd);
+	err = eloop_start(ctx->ps_eloop, &ctx->sigset);
+	if (err < 0)
+		return err;
 
 	errno = psr_ctx.psr_error.psr_errno;
 	*data = psr_ctx.psr_data;
@@ -873,8 +871,9 @@ ps_root_start(struct dhcpcd_ctx *ctx)
 		.psi_cmd = PS_ROOT,
 	};
 	struct ps_process *psp;
-	int logfd[2], datafd[2];
+	int logfd[2] = { -1, -1}, datafd[2] = { -1, -1};
 	pid_t pid;
+	struct psr_ctx *pc;
 
 	if (xsocketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CXNB, 0, logfd) == -1)
 		return -1;
@@ -892,10 +891,30 @@ ps_root_start(struct dhcpcd_ctx *ctx)
 		return -1;
 #endif
 
+
+	pc = malloc(sizeof(*pc));
+	if (pc == NULL)
+		return -1;
+	pc->psr_ctx = ctx;
+
 	psp = ctx->ps_root = ps_newprocess(ctx, &id);
+	if (psp == NULL)
+	{
+		free(pc);
+		return -1;
+	}
 	strlcpy(psp->psp_name, "privileged proxy", sizeof(psp->psp_name));
 	pid = ps_startprocess(psp, ps_root_recvmsg, NULL,
-	    ps_root_startcb, ps_root_signalcb, PSF_ELOOP);
+	    ps_root_startcb, PSF_ELOOP);
+	if (pid == -1) {
+		free(pc);
+		return -1;
+	}
+
+	psp->psp_data = pc;
+	if (eloop_event_add(ctx->ps_eloop, psp->psp_fd, ELE_READ,
+	    ps_root_readerrorcb, pc) == -1)
+		return -1;
 
 	if (pid == 0) {
 		ctx->ps_log_fd = logfd[0]; /* Keep open to pass to processes */
@@ -916,7 +935,7 @@ ps_root_start(struct dhcpcd_ctx *ctx)
 	close(datafd[1]);
 	if (eloop_event_add(ctx->eloop, ctx->ps_data_fd, ELE_READ,
 	    ps_root_dispatch, ctx) == -1)
-		return 1;
+		return -1;
 
 	return pid;
 }