commit 68a2ece737df08fa987885c91dccc57fdd3dc927
author Jeremy Kerr <jk@ozlabs.org> Tue Jan 17 13:52:41 2017 +0800
committer Patrick Williams <patrick@stwcx.xyz> Tue Jan 17 05:40:22 2017 -0600
tree 2658e8e729b92b4dc4eba0d0b5969b7033d2c1a5
parent 9c297af277bdc7f79a593db0060582c92310f980

socket-handler: don't set global O_NONBLOCK flag on client sockets

We will want to perform blocking writes in a future change, and setting
O_NONBLOCK on the file descriptor makes this difficult. Instead, don't
specify O_NONBLOCK, and use send/recv (which allows us to specify
MSG_DONTWAIT) instead of write/read.

Change-Id: I425b1e4fd37c51e27a9f334dfeff344bb7bc5f97
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

socket-handler.c

diff --git a/socket-handler.c b/socket-handler.c
index 3cb635b..6ebe10e 100644
--- a/socket-handler.c
+++ b/socket-handler.c
@@ -87,14 +87,14 @@
  * return indicates that no bytes were written due to potential block,
  * but isn't a failure
  */
-static ssize_t client_write_data(struct client *client, uint8_t *buf,
+static ssize_t client_send_data(struct client *client, uint8_t *buf,
 		size_t len)
 {
 	size_t pos;
 	ssize_t rc;
 
 	for (pos = 0; pos < len; pos += rc) {
-		rc = write(client->fd, buf + pos, len - pos);
+		rc = send(client->fd, buf + pos, len - pos, MSG_DONTWAIT);
 		if (rc < 0) {
 			if (errno == EAGAIN || errno == EWOULDBLOCK)
 				break;
@@ -121,7 +121,7 @@
 	int rc;
 
 	if (events & POLLIN) {
-		rc = read(client->fd, buf, sizeof(buf));
+		rc = recv(client->fd, buf, sizeof(buf), MSG_DONTWAIT);
 		if (rc <= 0)
 			goto err_close;
 
@@ -129,7 +129,7 @@
 	}
 
 	if (events & POLLOUT) {
-		len = client_write_data(client, client->buf, client->buf_len);
+		len = client_send_data(client, client->buf, client->buf_len);
 		if (len < 0)
 			goto err_close;
 
@@ -169,9 +169,9 @@
 {
 	ssize_t rc;
 
-	/* only write if the queue is empty */
+	/* only send if the queue is empty */
 	if (!client->buf_len) {
-		rc = client_write_data(client, buf, len);
+		rc = client_send_data(client, buf, len);
 		if (rc < 0)
 			return -1;
 	} else {
@@ -197,7 +197,7 @@
 	if (!(events & POLLIN))
 		return POLLER_OK;
 
-	fd = accept4(sh->sd, NULL, NULL, SOCK_NONBLOCK);
+	fd = accept(sh->sd, NULL, NULL);
 	if (fd < 0)
 		return POLLER_OK;