]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
privsep: Log ECONNRESET errors again
authorRoy Marples <roy@marples.name>
Thu, 4 Jun 2020 11:31:24 +0000 (12:31 +0100)
committerRoy Marples <roy@marples.name>
Thu, 4 Jun 2020 11:31:24 +0000 (12:31 +0100)
Now that we've improved the robustness of the IPC this is important.

src/privsep-bpf.c
src/privsep-root.c

index e1fd8bc72ece783b406ca28085c1cec5c1add513..6189349db0f09e63b2bbf7a7f803305a6e4de6fd 100644 (file)
@@ -82,7 +82,7 @@ ps_bpf_recvbpf(void *arg)
                psm.ps_flags = bpf->bpf_flags;
                len = ps_sendpsmdata(psp->psp_ctx, psp->psp_ctx->ps_data_fd,
                    &psm, buf, (size_t)len);
-               if (len == -1 && errno != ECONNRESET)
+               if (len == -1)
                        logerr(__func__);
                if (len == -1 || len == 0)
                        break;
index 2a45abb9092cd94c9d525c4f9fe3c8087e219d56..fdf4385681f82684d618904ef92965dc2ac5f396 100644 (file)
@@ -596,8 +596,7 @@ ps_root_recvmsg(void *arg)
 {
        struct dhcpcd_ctx *ctx = arg;
 
-       if (ps_recvpsmsg(ctx, ctx->ps_root_fd, ps_root_recvmsgcb, ctx) == -1 &&
-           errno != ECONNRESET)
+       if (ps_recvpsmsg(ctx, ctx->ps_root_fd, ps_root_recvmsgcb, ctx) == -1)
                logerr(__func__);
 }