From 26b2978f6d43f432d64360f43d06e6bf9be0d4a5 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 3 May 2015 13:58:45 +0200
Subject: [PATCH] allow the _timeout functions to operate without a timeout

---
 src/common.c    | 64 +++++++++++++++++++++++++------------------------
 src/main-misc.c |  4 +++-
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/common.c b/src/common.c
index 36be448a..d8559dc8 100644
--- a/src/common.c
+++ b/src/common.c
@@ -144,19 +144,23 @@ uint8_t * p = buf;
 struct timeval tv;
 fd_set set;
 
-	tv.tv_sec = sec;
-	tv.tv_usec = 0;
+	if (sec > 0) {
+		tv.tv_sec = sec;
+		tv.tv_usec = 0;
 
-	FD_ZERO(&set);
-	FD_SET(sockfd, &set);
+		FD_ZERO(&set);
+		FD_SET(sockfd, &set);
+	}
 
 	while(left > 0) {
-		ret = select(sockfd + 1, &set, NULL, NULL, &tv);
-		if (ret == -1 && errno == EINTR)
-			continue;
-		if (ret == -1 || ret == 0) {
-			errno = ETIMEDOUT;
-			return -1;
+		if (sec > 0) {
+			ret = select(sockfd + 1, &set, NULL, NULL, &tv);
+			if (ret == -1 && errno == EINTR)
+				continue;
+			if (ret == -1 || ret == 0) {
+				errno = ETIMEDOUT;
+				return -1;
+			}
 		}
 
 		ret = read(sockfd, p, left);
@@ -223,22 +227,28 @@ int ret;
 struct timeval tv;
 fd_set set;
 
-	tv.tv_sec = sec;
-	tv.tv_usec = 0;
+	if (sec) {
+		tv.tv_sec = sec;
+		tv.tv_usec = 0;
 
-	FD_ZERO(&set);
-	FD_SET(sockfd, &set);
+		FD_ZERO(&set);
+		FD_SET(sockfd, &set);
 
-	do {
-		ret = select(sockfd + 1, &set, NULL, NULL, &tv);
-	} while (ret == -1 && errno == EINTR);
+		do {
+			ret = select(sockfd + 1, &set, NULL, NULL, &tv);
+		} while (ret == -1 && errno == EINTR);
 
-	if (ret == -1 || ret == 0) {
-		errno = ETIMEDOUT;
-		return -1;
+		if (ret == -1 || ret == 0) {
+			errno = ETIMEDOUT;
+			return -1;
+		}
 	}
 
-	return recvmsg(sockfd, msg, flags);
+	do {
+		ret = recvmsg(sockfd, msg, flags);
+	} while (ret == -1 && errno == EINTR);
+
+	return ret;
 }
 
 int ip_cmp(const struct sockaddr_storage *s1, const struct sockaddr_storage *s2)
@@ -388,12 +398,7 @@ int recv_socket_msg(void *pool, int fd, uint8_t cmd,
 	hdr.msg_control = control_un.control;
 	hdr.msg_controllen = sizeof(control_un.control);
 
-	do {
-		if (timeout)
-			ret = recvmsg_timeout(fd, &hdr, 0, timeout);
-		else
-			ret = recvmsg(fd, &hdr, 0);
-	} while (ret == -1 && errno == EINTR);
+	ret = recvmsg_timeout(fd, &hdr, 0, timeout);
 	if (ret == -1) {
 		int e = errno;
 		syslog(LOG_ERR, "%s:%u: recvmsg: %s", __FILE__, __LINE__, strerror(e));
@@ -430,10 +435,7 @@ int recv_socket_msg(void *pool, int fd, uint8_t cmd,
 			goto cleanup;
 		}
 
-		if (timeout)
-			ret = force_read_timeout(fd, data, length, timeout);
-		else
-			ret = force_read(fd, data, length);
+		ret = force_read_timeout(fd, data, length, timeout);
 		if (ret < length) {
 			int e = errno;
 			syslog(LOG_ERR, "%s:%u: recvmsg: %s", __FILE__, __LINE__, strerror(e));
diff --git a/src/main-misc.c b/src/main-misc.c
index 97ca8717..1efdef47 100644
--- a/src/main-misc.c
+++ b/src/main-misc.c
@@ -313,7 +313,9 @@ int handle_commands(main_server_st * s, struct proc_st *proc)
 	hdr.msg_iov = iov;
 	hdr.msg_iovlen = 2;
 
-	ret = recvmsg(proc->fd, &hdr, 0);
+	do {
+		ret = recvmsg(proc->fd, &hdr, 0);
+	} while (ret == -1 && errno == EINTR);
 	if (ret == -1) {
 		e = errno;
 		mslog(s, proc, LOG_ERR,