lib/async_req/async_sock.c set socket close on exec
[samba.git] / lib / async_req / async_sock.c
index 39705f45bb251ec6386b3ecaa767da18bb8ffbfc..0a8a333f4f34152dedb6f3d423be3f4c3135144b 100644 (file)
    async socket syscalls
    Copyright (C) Volker Lendecke 2008
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
+     ** NOTE! The following LGPL license applies to the async_sock
+     ** library. This does NOT imply that all of Samba is released
+     ** under the LGPL
 
-   This program is distributed in the hope that it will be useful,
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "lib/talloc/talloc.h"
-#include "lib/tevent/tevent.h"
-#include "lib/async_req/async_req.h"
+#include "replace.h"
+#include "system/network.h"
+#include "system/filesys.h"
+#include <talloc.h>
+#include <tevent.h>
 #include "lib/async_req/async_sock.h"
-#include "lib/util/tevent_unix.h"
-#include <fcntl.h>
-
-#ifndef TALLOC_FREE
-#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
-#endif
-
-/**
- * @brief Map async_req states to unix-style errnos
- * @param[in]  req     The async req to get the state from
- * @param[out] err     Pointer to take the unix-style errno
- *
- * @return true if the async_req is in an error state, false otherwise
- */
-
-bool async_req_is_errno(struct async_req *req, int *err)
-{
-       enum async_req_state state;
-       uint64_t error;
-
-       if (!async_req_is_error(req, &state, &error)) {
-               return false;
-       }
-
-       switch (state) {
-       case ASYNC_REQ_USER_ERROR:
-               *err = (int)error;
-               break;
-       case ASYNC_REQ_TIMED_OUT:
-#ifdef ETIMEDOUT
-               *err = ETIMEDOUT;
-#else
-               *err = EAGAIN;
-#endif
-               break;
-       case ASYNC_REQ_NO_MEMORY:
-               *err = ENOMEM;
-               break;
-       default:
-               *err = EIO;
-               break;
-       }
-       return true;
-}
-
-int async_req_simple_recv_errno(struct async_req *req)
-{
-       int err;
-
-       if (async_req_is_errno(req, &err)) {
-               return err;
-       }
-
-       return 0;
-}
-
-struct async_send_state {
-       int fd;
-       const void *buf;
-       size_t len;
-       int flags;
-       ssize_t sent;
-};
-
-static void async_send_handler(struct tevent_context *ev,
-                              struct tevent_fd *fde,
-                              uint16_t flags, void *private_data);
-
-struct tevent_req *async_send_send(TALLOC_CTX *mem_ctx,
-                                  struct tevent_context *ev,
-                                  int fd, const void *buf, size_t len,
-                                  int flags)
-{
-       struct tevent_req *result;
-       struct async_send_state *state;
-       struct tevent_fd *fde;
-
-       result = tevent_req_create(mem_ctx, &state, struct async_send_state);
-       if (result == NULL) {
-               return result;
-       }
-       state->fd = fd;
-       state->buf = buf;
-       state->len = len;
-       state->flags = flags;
-
-       fde = tevent_add_fd(ev, state, fd, TEVENT_FD_WRITE, async_send_handler,
-                           result);
-       if (fde == NULL) {
-               TALLOC_FREE(result);
-               return NULL;
-       }
-       return result;
-}
-
-static void async_send_handler(struct tevent_context *ev,
-                              struct tevent_fd *fde,
-                              uint16_t flags, void *private_data)
-{
-       struct tevent_req *req = talloc_get_type_abort(
-               private_data, struct tevent_req);
-       struct async_send_state *state =
-               tevent_req_data(req, struct async_send_state);
-
-       state->sent = send(state->fd, state->buf, state->len, state->flags);
-       if (state->sent == -1) {
-               tevent_req_error(req, errno);
-               return;
-       }
-       tevent_req_done(req);
-}
-
-ssize_t async_send_recv(struct tevent_req *req, int *perrno)
-{
-       struct async_send_state *state =
-               tevent_req_data(req, struct async_send_state);
-
-       if (tevent_req_is_unix_error(req, perrno)) {
-               return -1;
-       }
-       return state->sent;
-}
-
-struct async_recv_state {
-       int fd;
-       void *buf;
-       size_t len;
-       int flags;
-       ssize_t received;
-};
-
-static void async_recv_handler(struct tevent_context *ev,
-                              struct tevent_fd *fde,
-                              uint16_t flags, void *private_data);
-
-struct tevent_req *async_recv_send(TALLOC_CTX *mem_ctx,
-                                  struct tevent_context *ev,
-                                  int fd, void *buf, size_t len, int flags)
-{
-       struct tevent_req *result;
-       struct async_recv_state *state;
-       struct tevent_fd *fde;
-
-       result = tevent_req_create(mem_ctx, &state, struct async_recv_state);
-       if (result == NULL) {
-               return result;
-       }
-       state->fd = fd;
-       state->buf = buf;
-       state->len = len;
-       state->flags = flags;
-
-       fde = tevent_add_fd(ev, state, fd, TEVENT_FD_READ, async_recv_handler,
-                           result);
-       if (fde == NULL) {
-               TALLOC_FREE(result);
-               return NULL;
-       }
-       return result;
-}
-
-static void async_recv_handler(struct tevent_context *ev,
-                              struct tevent_fd *fde,
-                              uint16_t flags, void *private_data)
-{
-       struct tevent_req *req = talloc_get_type_abort(
-               private_data, struct tevent_req);
-       struct async_recv_state *state =
-               tevent_req_data(req, struct async_recv_state);
+#include "lib/util/iov_buf.h"
 
-       state->received = recv(state->fd, state->buf, state->len,
-                              state->flags);
-       if (state->received == -1) {
-               tevent_req_error(req, errno);
-               return;
-       }
-       tevent_req_done(req);
-}
-
-ssize_t async_recv_recv(struct tevent_req *req, int *perrno)
-{
-       struct async_recv_state *state =
-               tevent_req_data(req, struct async_recv_state);
-
-       if (tevent_req_is_unix_error(req, perrno)) {
-               return -1;
-       }
-       return state->received;
-}
+/* Note: lib/util/ is currently GPL */
+#include "lib/util/tevent_unix.h"
+#include "lib/util/samba_util.h"
 
 struct async_connect_state {
        int fd;
+       struct tevent_fd *fde;
        int result;
-       int sys_errno;
        long old_sockflags;
+       socklen_t address_len;
+       struct sockaddr_storage address;
+
+       void (*before_connect)(void *private_data);
+       void (*after_connect)(void *private_data);
+       void *private_data;
 };
 
+static void async_connect_cleanup(struct tevent_req *req,
+                                 enum tevent_req_state req_state);
 static void async_connect_connected(struct tevent_context *ev,
                                    struct tevent_fd *fde, uint16_t flags,
                                    void *priv);
@@ -236,18 +65,19 @@ static void async_connect_connected(struct tevent_context *ev,
  * connect in an async state. This will be reset when the request is finished.
  */
 
-struct tevent_req *async_connect_send(TALLOC_CTX *mem_ctx,
-                                     struct tevent_context *ev,
-                                     int fd, const struct sockaddr *address,
-                                     socklen_t address_len)
+struct tevent_req *async_connect_send(
+       TALLOC_CTX *mem_ctx, struct tevent_context *ev, int fd,
+       const struct sockaddr *address, socklen_t address_len,
+       void (*before_connect)(void *private_data),
+       void (*after_connect)(void *private_data),
+       void *private_data)
 {
-       struct tevent_req *result;
+       struct tevent_req *req;
        struct async_connect_state *state;
-       struct tevent_fd *fde;
+       int ret;
 
-       result = tevent_req_create(
-               mem_ctx, &state, struct async_connect_state);
-       if (result == NULL) {
+       req = tevent_req_create(mem_ctx, &state, struct async_connect_state);
+       if (req == NULL) {
                return NULL;
        }
 
@@ -257,50 +87,92 @@ struct tevent_req *async_connect_send(TALLOC_CTX *mem_ctx,
         */
 
        state->fd = fd;
-       state->sys_errno = 0;
+       state->before_connect = before_connect;
+       state->after_connect = after_connect;
+       state->private_data = private_data;
 
        state->old_sockflags = fcntl(fd, F_GETFL, 0);
        if (state->old_sockflags == -1) {
-               goto post_errno;
+               tevent_req_error(req, errno);
+               return tevent_req_post(req, ev);
        }
 
-       set_blocking(fd, false);
+       tevent_req_set_cleanup_fn(req, async_connect_cleanup);
+
+       state->address_len = address_len;
+       if (address_len > sizeof(state->address)) {
+               tevent_req_error(req, EINVAL);
+               return tevent_req_post(req, ev);
+       }
+       memcpy(&state->address, address, address_len);
+
+       ret = set_blocking(fd, false);
+       if (ret == -1) {
+               tevent_req_error(req, errno);
+               return tevent_req_post(req, ev);
+       }
+
+       if (state->before_connect != NULL) {
+               state->before_connect(state->private_data);
+       }
 
        state->result = connect(fd, address, address_len);
+
+       if (state->after_connect != NULL) {
+               state->after_connect(state->private_data);
+       }
+
        if (state->result == 0) {
-               tevent_req_done(result);
-               goto done;
+               tevent_req_done(req);
+               return tevent_req_post(req, ev);
        }
 
-       /**
-        * A number of error messages show that something good is progressing
-        * and that we have to wait for readability.
+       /*
+        * The only errno indicating that an initial connect is still
+        * in flight is EINPROGRESS.
         *
-        * If none of them are present, bail out.
+        * We get EALREADY when someone calls us a second time for a
+        * given fd and the connect is still in flight (and returned
+        * EINPROGRESS the first time).
+        *
+        * This allows callers like open_socket_out_send() to reuse
+        * fds and call us with an fd for which the connect is still
+        * in flight. The proper thing to do for callers would be
+        * closing the fd and starting from scratch with a fresh
+        * socket.
         */
 
-       if (!(errno == EINPROGRESS || errno == EALREADY ||
-#ifdef EISCONN
-             errno == EISCONN ||
-#endif
-             errno == EAGAIN || errno == EINTR)) {
-               state->sys_errno = errno;
-               goto post_errno;
+       if (errno != EINPROGRESS && errno != EALREADY) {
+               tevent_req_error(req, errno);
+               return tevent_req_post(req, ev);
        }
 
-       fde = tevent_add_fd(ev, state, fd, TEVENT_FD_READ | TEVENT_FD_WRITE,
-                          async_connect_connected, result);
-       if (fde == NULL) {
-               state->sys_errno = ENOMEM;
-               goto post_errno;
+       state->fde = tevent_add_fd(ev, state, fd, TEVENT_FD_WRITE,
+                                  async_connect_connected, req);
+       if (state->fde == NULL) {
+               tevent_req_error(req, ENOMEM);
+               return tevent_req_post(req, ev);
        }
-       return result;
+       return req;
+}
 
- post_errno:
-       tevent_req_error(result, state->sys_errno);
- done:
-       fcntl(fd, F_SETFL, state->old_sockflags);
-       return tevent_req_post(result, ev);
+static void async_connect_cleanup(struct tevent_req *req,
+                                 enum tevent_req_state req_state)
+{
+       struct async_connect_state *state =
+               tevent_req_data(req, struct async_connect_state);
+
+       TALLOC_FREE(state->fde);
+       if (state->fd != -1) {
+               int ret;
+
+               ret = fcntl(state->fd, F_SETFL, state->old_sockflags);
+               if (ret == -1) {
+                       abort();
+               }
+
+               state->fd = -1;
+       }
 }
 
 /**
@@ -319,79 +191,77 @@ static void async_connect_connected(struct tevent_context *ev,
                priv, struct tevent_req);
        struct async_connect_state *state =
                tevent_req_data(req, struct async_connect_state);
+       int ret;
+       int socket_error = 0;
+       socklen_t slen = sizeof(socket_error);
+
+       ret = getsockopt(state->fd, SOL_SOCKET, SO_ERROR,
+                        &socket_error, &slen);
+
+       if (ret != 0) {
+               /*
+                * According to Stevens this is the Solaris behaviour
+                * in case the connection encountered an error:
+                * getsockopt() fails, error is in errno
+                */
+               tevent_req_error(req, errno);
+               return;
+       }
 
-       TALLOC_FREE(fde);
-
-       /*
-        * Stevens, Network Programming says that if there's a
-        * successful connect, the socket is only writable. Upon an
-        * error, it's both readable and writable.
-        */
-       if ((flags & (TEVENT_FD_READ|TEVENT_FD_WRITE))
-           == (TEVENT_FD_READ|TEVENT_FD_WRITE)) {
-               int sockerr;
-               socklen_t err_len = sizeof(sockerr);
-
-               if (getsockopt(state->fd, SOL_SOCKET, SO_ERROR,
-                              (void *)&sockerr, &err_len) == 0) {
-                       errno = sockerr;
-               }
-
-               state->sys_errno = errno;
-
-               DEBUG(10, ("connect returned %s\n", strerror(errno)));
-
-               fcntl(state->fd, F_SETFL, state->old_sockflags);
-               tevent_req_error(req, state->sys_errno);
+       if (socket_error != 0) {
+               /*
+                * Berkeley derived implementations (including) Linux
+                * return the pending error via socket_error.
+                */
+               tevent_req_error(req, socket_error);
                return;
        }
 
-       state->sys_errno = 0;
        tevent_req_done(req);
+       return;
 }
 
 int async_connect_recv(struct tevent_req *req, int *perrno)
 {
-       struct async_connect_state *state =
-               tevent_req_data(req, struct async_connect_state);
-       int err;
+       int err = tevent_req_simple_recv_unix(req);
 
-       fcntl(state->fd, F_SETFL, state->old_sockflags);
-
-       if (tevent_req_is_unix_error(req, &err)) {
+       if (err != 0) {
                *perrno = err;
                return -1;
        }
 
-       if (state->sys_errno == 0) {
-               return 0;
-       }
-
-       *perrno = state->sys_errno;
-       return -1;
+       return 0;
 }
 
 struct writev_state {
        struct tevent_context *ev;
+       struct tevent_queue_entry *queue_entry;
        int fd;
+       struct tevent_fd *fde;
        struct iovec *iov;
        int count;
        size_t total_size;
+       uint16_t flags;
+       bool err_on_readability;
 };
 
+static void writev_cleanup(struct tevent_req *req,
+                          enum tevent_req_state req_state);
+static bool writev_cancel(struct tevent_req *req);
 static void writev_trigger(struct tevent_req *req, void *private_data);
 static void writev_handler(struct tevent_context *ev, struct tevent_fd *fde,
                           uint16_t flags, void *private_data);
 
 struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
                               struct tevent_queue *queue, int fd,
+                              bool err_on_readability,
                               struct iovec *iov, int count)
 {
-       struct tevent_req *result;
+       struct tevent_req *req;
        struct writev_state *state;
 
-       result = tevent_req_create(mem_ctx, &state, struct writev_state);
-       if (result == NULL) {
+       req = tevent_req_create(mem_ctx, &state, struct writev_state);
+       if (req == NULL) {
                return NULL;
        }
        state->ev = ev;
@@ -400,28 +270,78 @@ struct tevent_req *writev_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
        state->count = count;
        state->iov = (struct iovec *)talloc_memdup(
                state, iov, sizeof(struct iovec) * count);
-       if (state->iov == NULL) {
-               goto fail;
+       if (tevent_req_nomem(state->iov, req)) {
+               return tevent_req_post(req, ev);
+       }
+       state->flags = TEVENT_FD_WRITE|TEVENT_FD_READ;
+       state->err_on_readability = err_on_readability;
+
+       tevent_req_set_cleanup_fn(req, writev_cleanup);
+       tevent_req_set_cancel_fn(req, writev_cancel);
+
+       if (queue == NULL) {
+               state->fde = tevent_add_fd(state->ev, state, state->fd,
+                                   state->flags, writev_handler, req);
+               if (tevent_req_nomem(state->fde, req)) {
+                       return tevent_req_post(req, ev);
+               }
+               return req;
        }
 
-       if (!tevent_queue_add(queue, ev, result, writev_trigger, NULL)) {
-               goto fail;
+       state->queue_entry = tevent_queue_add_entry(queue, ev, req,
+                                                   writev_trigger, NULL);
+       if (tevent_req_nomem(state->queue_entry, req)) {
+               return tevent_req_post(req, ev);
        }
-       return result;
- fail:
-       TALLOC_FREE(result);
-       return NULL;
+       return req;
+}
+
+static void writev_cleanup(struct tevent_req *req,
+                          enum tevent_req_state req_state)
+{
+       struct writev_state *state = tevent_req_data(req, struct writev_state);
+
+       TALLOC_FREE(state->queue_entry);
+       TALLOC_FREE(state->fde);
+}
+
+static bool writev_cancel(struct tevent_req *req)
+{
+       struct writev_state *state = tevent_req_data(req, struct writev_state);
+
+       TALLOC_FREE(state->queue_entry);
+       TALLOC_FREE(state->fde);
+
+       if (state->count == 0) {
+               /*
+                * already completed.
+                */
+               return false;
+       }
+
+       tevent_req_defer_callback(req, state->ev);
+       if (state->total_size > 0) {
+               /*
+                * We've already started to write :-(
+                */
+               tevent_req_error(req, EIO);
+               return false;
+       }
+
+       tevent_req_error(req, ECANCELED);
+       return true;
 }
 
 static void writev_trigger(struct tevent_req *req, void *private_data)
 {
        struct writev_state *state = tevent_req_data(req, struct writev_state);
-       struct tevent_fd *fde;
 
-       fde = tevent_add_fd(state->ev, state, state->fd, TEVENT_FD_WRITE,
+       state->queue_entry = NULL;
+
+       state->fde = tevent_add_fd(state->ev, state, state->fd, state->flags,
                            writev_handler, req);
-       if (fde == NULL) {
-               tevent_req_error(req, ENOMEM);
+       if (tevent_req_nomem(state->fde, req)) {
+               return;
        }
 }
 
@@ -432,16 +352,46 @@ static void writev_handler(struct tevent_context *ev, struct tevent_fd *fde,
                private_data, struct tevent_req);
        struct writev_state *state =
                tevent_req_data(req, struct writev_state);
-       size_t to_write, written;
-       int i;
+       ssize_t written;
+       bool ok;
 
-       to_write = 0;
+       if ((state->flags & TEVENT_FD_READ) && (flags & TEVENT_FD_READ)) {
+               int ret, value;
 
-       for (i=0; i<state->count; i++) {
-               to_write += state->iov[i].iov_len;
+               if (state->err_on_readability) {
+                       /* Readable and the caller wants an error on read. */
+                       tevent_req_error(req, EPIPE);
+                       return;
+               }
+
+               /* Might be an error. Check if there are bytes to read */
+               ret = ioctl(state->fd, FIONREAD, &value);
+               /* FIXME - should we also check
+                  for ret == 0 and value == 0 here ? */
+               if (ret == -1) {
+                       /* There's an error. */
+                       tevent_req_error(req, EPIPE);
+                       return;
+               }
+               /* A request for TEVENT_FD_READ will succeed from now and
+                  forevermore until the bytes are read so if there was
+                  an error we'll wait until we do read, then get it in
+                  the read callback function. Until then, remove TEVENT_FD_READ
+                  from the flags we're waiting for. */
+               state->flags &= ~TEVENT_FD_READ;
+               TEVENT_FD_NOT_READABLE(fde);
+
+               /* If not writable, we're done. */
+               if (!(flags & TEVENT_FD_WRITE)) {
+                       return;
+               }
        }
 
-       written = sys_writev(state->fd, state->iov, state->count);
+       written = writev(state->fd, state->iov, state->count);
+       if ((written == -1) && (errno == EINTR)) {
+               /* retry */
+               return;
+       }
        if (written == -1) {
                tevent_req_error(req, errno);
                return;
@@ -452,26 +402,15 @@ static void writev_handler(struct tevent_context *ev, struct tevent_fd *fde,
        }
        state->total_size += written;
 
-       if (written == to_write) {
-               tevent_req_done(req);
+       ok = iov_advance(&state->iov, &state->count, written);
+       if (!ok) {
+               tevent_req_error(req, EIO);
                return;
        }
 
-       /*
-        * We've written less than we were asked to, drop stuff from
-        * state->iov.
-        */
-
-       while (written > 0) {
-               if (written < state->iov[0].iov_len) {
-                       state->iov[0].iov_base =
-                               (char *)state->iov[0].iov_base + written;
-                       state->iov[0].iov_len -= written;
-                       break;
-               }
-               written -= state->iov[0].iov_len;
-               state->iov += 1;
-               state->count -= 1;
+       if (state->count == 0) {
+               tevent_req_done(req);
+               return;
        }
 }
 
@@ -479,21 +418,28 @@ ssize_t writev_recv(struct tevent_req *req, int *perrno)
 {
        struct writev_state *state =
                tevent_req_data(req, struct writev_state);
+       ssize_t ret;
 
        if (tevent_req_is_unix_error(req, perrno)) {
+               tevent_req_received(req);
                return -1;
        }
-       return state->total_size;
+       ret = state->total_size;
+       tevent_req_received(req);
+       return ret;
 }
 
 struct read_packet_state {
        int fd;
+       struct tevent_fd *fde;
        uint8_t *buf;
        size_t nread;
        ssize_t (*more)(uint8_t *buf, size_t buflen, void *private_data);
        void *private_data;
 };
 
+static void read_packet_cleanup(struct tevent_req *req,
+                                enum tevent_req_state req_state);
 static void read_packet_handler(struct tevent_context *ev,
                                struct tevent_fd *fde,
                                uint16_t flags, void *private_data);
@@ -506,12 +452,11 @@ struct tevent_req *read_packet_send(TALLOC_CTX *mem_ctx,
                                                    void *private_data),
                                    void *private_data)
 {
-       struct tevent_req *result;
+       struct tevent_req *req;
        struct read_packet_state *state;
-       struct tevent_fd *fde;
 
-       result = tevent_req_create(mem_ctx, &state, struct read_packet_state);
-       if (result == NULL) {
+       req = tevent_req_create(mem_ctx, &state, struct read_packet_state);
+       if (req == NULL) {
                return NULL;
        }
        state->fd = fd;
@@ -519,20 +464,29 @@ struct tevent_req *read_packet_send(TALLOC_CTX *mem_ctx,
        state->more = more;
        state->private_data = private_data;
 
+       tevent_req_set_cleanup_fn(req, read_packet_cleanup);
+
        state->buf = talloc_array(state, uint8_t, initial);
-       if (state->buf == NULL) {
-               goto fail;
+       if (tevent_req_nomem(state->buf, req)) {
+               return tevent_req_post(req, ev);
        }
 
-       fde = tevent_add_fd(ev, state, fd, TEVENT_FD_READ, read_packet_handler,
-                           result);
-       if (fde == NULL) {
-               goto fail;
+       state->fde = tevent_add_fd(ev, state, fd,
+                                  TEVENT_FD_READ, read_packet_handler,
+                                  req);
+       if (tevent_req_nomem(state->fde, req)) {
+               return tevent_req_post(req, ev);
        }
-       return result;
- fail:
-       TALLOC_FREE(result);
-       return NULL;
+       return req;
+}
+
+static void read_packet_cleanup(struct tevent_req *req,
+                          enum tevent_req_state req_state)
+{
+       struct read_packet_state *state =
+               tevent_req_data(req, struct read_packet_state);
+
+       TALLOC_FREE(state->fde);
 }
 
 static void read_packet_handler(struct tevent_context *ev,
@@ -549,6 +503,14 @@ static void read_packet_handler(struct tevent_context *ev,
 
        nread = recv(state->fd, state->buf+state->nread, total-state->nread,
                     0);
+       if ((nread == -1) && (errno == ENOTSOCK)) {
+               nread = read(state->fd, state->buf+state->nread,
+                            total-state->nread);
+       }
+       if ((nread == -1) && (errno == EINTR)) {
+               /* retry */
+               return;
+       }
        if (nread == -1) {
                tevent_req_error(req, errno);
                return;
@@ -585,7 +547,12 @@ static void read_packet_handler(struct tevent_context *ev,
                return;
        }
 
-       tmp = TALLOC_REALLOC_ARRAY(state, state->buf, uint8_t, total+more);
+       if (total + more < total) {
+               tevent_req_error(req, EMSGSIZE);
+               return;
+       }
+
+       tmp = talloc_realloc(state, state->buf, uint8_t, total+more);
        if (tevent_req_nomem(tmp, req)) {
                return;
        }
@@ -599,8 +566,200 @@ ssize_t read_packet_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                tevent_req_data(req, struct read_packet_state);
 
        if (tevent_req_is_unix_error(req, perrno)) {
+               tevent_req_received(req);
                return -1;
        }
        *pbuf = talloc_move(mem_ctx, &state->buf);
+       tevent_req_received(req);
        return talloc_get_size(*pbuf);
 }
+
+struct wait_for_read_state {
+       struct tevent_fd *fde;
+       int fd;
+       bool check_errors;
+};
+
+static void wait_for_read_cleanup(struct tevent_req *req,
+                                 enum tevent_req_state req_state);
+static void wait_for_read_done(struct tevent_context *ev,
+                              struct tevent_fd *fde,
+                              uint16_t flags,
+                              void *private_data);
+
+struct tevent_req *wait_for_read_send(TALLOC_CTX *mem_ctx,
+                                     struct tevent_context *ev, int fd,
+                                     bool check_errors)
+{
+       struct tevent_req *req;
+       struct wait_for_read_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct wait_for_read_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       tevent_req_set_cleanup_fn(req, wait_for_read_cleanup);
+
+       state->fde = tevent_add_fd(ev, state, fd, TEVENT_FD_READ,
+                                  wait_for_read_done, req);
+       if (tevent_req_nomem(state->fde, req)) {
+               return tevent_req_post(req, ev);
+       }
+
+       state->fd = fd;
+       state->check_errors = check_errors;
+       return req;
+}
+
+static void wait_for_read_cleanup(struct tevent_req *req,
+                                 enum tevent_req_state req_state)
+{
+       struct wait_for_read_state *state =
+               tevent_req_data(req, struct wait_for_read_state);
+
+       TALLOC_FREE(state->fde);
+}
+
+static void wait_for_read_done(struct tevent_context *ev,
+                              struct tevent_fd *fde,
+                              uint16_t flags,
+                              void *private_data)
+{
+       struct tevent_req *req = talloc_get_type_abort(
+               private_data, struct tevent_req);
+       struct wait_for_read_state *state =
+           tevent_req_data(req, struct wait_for_read_state);
+       ssize_t nread;
+       char c;
+
+       if ((flags & TEVENT_FD_READ) == 0) {
+               return;
+       }
+
+       if (!state->check_errors) {
+               tevent_req_done(req);
+               return;
+       }
+
+       nread = recv(state->fd, &c, 1, MSG_PEEK);
+
+       if (nread == 0) {
+               tevent_req_error(req, EPIPE);
+               return;
+       }
+
+       if ((nread == -1) && (errno == EINTR)) {
+               /* come back later */
+               return;
+       }
+
+       if ((nread == -1) && (errno == ENOTSOCK)) {
+               /* Ignore this specific error on pipes */
+               tevent_req_done(req);
+               return;
+       }
+
+       if (nread == -1) {
+               tevent_req_error(req, errno);
+               return;
+       }
+
+       tevent_req_done(req);
+}
+
+bool wait_for_read_recv(struct tevent_req *req, int *perr)
+{
+       int err = tevent_req_simple_recv_unix(req);
+
+       if (err != 0) {
+               *perr = err;
+               return false;
+       }
+
+       return true;
+}
+
+struct accept_state {
+       struct tevent_fd *fde;
+       int listen_sock;
+       socklen_t addrlen;
+       struct sockaddr_storage addr;
+       int sock;
+};
+
+static void accept_handler(struct tevent_context *ev, struct tevent_fd *fde,
+                          uint16_t flags, void *private_data);
+
+struct tevent_req *accept_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
+                              int listen_sock)
+{
+       struct tevent_req *req;
+       struct accept_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct accept_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       state->listen_sock = listen_sock;
+
+       state->fde = tevent_add_fd(ev, state, listen_sock, TEVENT_FD_READ,
+                                  accept_handler, req);
+       if (tevent_req_nomem(state->fde, req)) {
+               return tevent_req_post(req, ev);
+       }
+       return req;
+}
+
+static void accept_handler(struct tevent_context *ev, struct tevent_fd *fde,
+                          uint16_t flags, void *private_data)
+{
+       struct tevent_req *req = talloc_get_type_abort(
+               private_data, struct tevent_req);
+       struct accept_state *state = tevent_req_data(req, struct accept_state);
+       int ret;
+
+       TALLOC_FREE(state->fde);
+
+       if ((flags & TEVENT_FD_READ) == 0) {
+               tevent_req_error(req, EIO);
+               return;
+       }
+       state->addrlen = sizeof(state->addr);
+
+       ret = accept(state->listen_sock, (struct sockaddr *)&state->addr,
+                    &state->addrlen);
+       if ((ret == -1) && (errno == EINTR)) {
+               /* retry */
+               return;
+       }
+       if (ret == -1) {
+               tevent_req_error(req, errno);
+               return;
+       }
+       smb_set_close_on_exec(ret);
+       state->sock = ret;
+       tevent_req_done(req);
+}
+
+int accept_recv(struct tevent_req *req, struct sockaddr_storage *paddr,
+               socklen_t *paddrlen, int *perr)
+{
+       struct accept_state *state = tevent_req_data(req, struct accept_state);
+       int err;
+
+       if (tevent_req_is_unix_error(req, &err)) {
+               if (perr != NULL) {
+                       *perr = err;
+               }
+               return -1;
+       }
+       if (paddr != NULL) {
+               memcpy(paddr, &state->addr, state->addrlen);
+       }
+       if (paddrlen != NULL) {
+               *paddrlen = state->addrlen;
+       }
+       return state->sock;
+}