From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 17 May 2018 08:32:48 +0000 (+0200)
Subject: Revert "tstream_bsd_writev_handler => sendmsg()"
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=b93453ed9005f3bbe4a4d1485647608066cf5625

Revert "tstream_bsd_writev_handler => sendmsg()"

This reverts commit 495d23e1bc7cae602a4e71fdaece622c7f570bb2.
---

diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 7ebc564692d7..708d17edc321 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -1114,7 +1114,6 @@ static void tdgram_bsd_sendto_handler(void *private_data)
 	ssize_t ret;
 	int err;
 	bool retry;
-	int flags = 0;
 
 	if (state->dst) {
 		struct tsocket_address_bsd *bsda =
@@ -1125,10 +1124,7 @@ static void tdgram_bsd_sendto_handler(void *private_data)
 		sa_socklen = bsda->sa_socklen;
 	}
 
-#ifdef MSG_NOSIGNAL
-	flags |= MSG_NOSIGNAL;
-#endif
-	ret = sendto(bsds->fd, state->buf, state->len, flags, sa, sa_socklen);
+	ret = sendto(bsds->fd, state->buf, state->len, 0, sa, sa_socklen);
 	err = tsocket_bsd_error_from_errno(ret, errno, &retry);
 	if (retry) {
 		/* retry later */
@@ -1989,21 +1985,8 @@ static void tstream_bsd_writev_handler(void *private_data)
 	int err;
 	int _count;
 	bool ok, retry;
-	struct msghdr msg;
-	int flags = 0;
-
-	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 */
-
-#ifdef MSG_NOSIGNAL
-	flags |= MSG_NOSIGNAL;
-#endif
-	ret = sendmsg(bsds->fd, &msg, flags);
+
+	ret = writev(bsds->fd, state->vector, state->count);
 	if (ret == 0) {
 		/* propagate end of file */
 		tevent_req_error(req, EPIPE);