From e934136f4c79a76ccd3a981e79c0adffcfc165ce Mon Sep 17 00:00:00 2001 From: pjd Date: Mon, 13 Nov 2006 15:13:05 +0000 Subject: [PATCH] MFC: sbin/ggate/shared/ggate.c 1.6 - Handle timeouts from recv(2) properly. - Increase timeout to 8 seconds (should be made configurable). Reported by: Kazuaki ODA Reported by: Ulrich Spoerlein Reported by: Christian Laursen PR: kern/104829 Approved by: re (bmah) --- shared/ggate.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/shared/ggate.c b/shared/ggate.c index c8428a6..5101092 100644 --- a/shared/ggate.c +++ b/shared/ggate.c @@ -250,8 +250,12 @@ g_gate_send(int s, const void *buf, size_t len, int flags) ssize_t g_gate_recv(int s, void *buf, size_t len, int flags) { + ssize_t done; - return (recv(s, buf, len, flags)); + do { + done = recv(s, buf, len, flags); + } while (done == -1 && errno == EAGAIN); + return (done); } int nagle = 1; @@ -280,7 +284,7 @@ g_gate_socket_settings(int sfd) bsize = sndbuf; if (setsockopt(sfd, SOL_SOCKET, SO_SNDBUF, &bsize, sizeof(bsize)) == -1) g_gate_xlog("setsockopt(SO_SNDBUF): %s.", strerror(errno)); - tv.tv_sec = 1; + tv.tv_sec = 8; tv.tv_usec = 0; if (setsockopt(sfd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) == -1) { g_gate_log(LOG_ERR, "setsockopt(SO_SNDTIMEO) error: %s.",