tsocket_bsd use sendmsg/recvmsg

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 7ebc564692d79b0edfb6fac6733a5a266819e8e1..9a6a9e2107438da190659527408936f4e769fe71 100644 (file)
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -929,6 +929,10 @@ static void tdgram_bsd_recvfrom_handler(void *private_data)
        ssize_t ret;
        int err;
        bool retry;
+#ifdef MSG_NOSIGNAL
+       struct msghdr msg;
+       struct iovec vec;
+#endif
 
        if (bsds->netlink) {
                ret = tsocket_bsd_netlink_pending(bsds->fd);
@@ -974,8 +978,27 @@ static void tdgram_bsd_recvfrom_handler(void *private_data)
        bsda->u.sa.sa_len = bsda->sa_socklen;
 #endif
 
+#ifdef MSG_NOSIGNAL
+       vec.iov_base = (char *)state->buf;
+       vec.iov_len = state->len;
+
+       msg.msg_name = &bsda->u.sa;    /* optional address */
+       msg.msg_namelen = bsda->sa_socklen; /* size of address */
+       msg.msg_iov = &vec;            /* scatter/gather array */
+       msg.msg_iovlen = 1;            /* # elements in msg_iov */
+       msg.msg_control = NULL;        /* ancillary data, see below */
+       msg.msg_controllen = 0;        /* ancillary data buffer len */
+       msg.msg_flags = 0;             /* flags on received message */
+
+       ret = recvmsg(bsds->fd, &msg, MSG_NOSIGNAL);
+       bsda->sa_socklen = msg.msg_namelen;
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+       bsda->u.sa.sa_len = bsda->sa_socklen;
+#endif
+#else
        ret = recvfrom(bsds->fd, state->buf, state->len, 0,
                       &bsda->u.sa, &bsda->sa_socklen);
+#endif
        err = tsocket_bsd_error_from_errno(ret, errno, &retry);
        if (retry) {
                /* retry later */
@@ -1846,8 +1869,21 @@ static void tstream_bsd_readv_handler(void *private_data)
        int err;
        int _count;
        bool ok, retry;
+#ifdef MSG_NOSIGNAL
+       struct msghdr msg;
 
+       msg.msg_name = NULL;           /* optional address */
+       msg.msg_namelen = 0;           /* size of address */
+       msg.msg_iov = state->vector;   /* scatter/gather array */
+       msg.msg_iovlen = state->count; /* # elements in msg_iov */
+       msg.msg_control = NULL;        /* ancillary data, see below */
+       msg.msg_controllen = 0;        /* ancillary data buffer len */
+       msg.msg_flags = 0;             /* flags on received message */
+
+       ret = recvmsg(bsds->fd, &msg, MSG_NOSIGNAL);
+#else
        ret = readv(bsds->fd, state->vector, state->count);
+#endif
        if (ret == 0) {
                /* propagate end of file */
                tevent_req_error(req, EPIPE);