From owner-svn-src-head@FreeBSD.ORG  Thu Jun 16 08:31:07 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0D9821065673;
	Thu, 16 Jun 2011 08:31:07 +0000 (UTC)
	(envelope-from sobomax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F2E8B8FC1A;
	Thu, 16 Jun 2011 08:31:06 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5G8V6Vv019610;
	Thu, 16 Jun 2011 08:31:06 GMT (envelope-from sobomax@svn.freebsd.org)
Received: (from sobomax@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5G8V63X019608;
	Thu, 16 Jun 2011 08:31:06 GMT (envelope-from sobomax@svn.freebsd.org)
Message-Id: <201106160831.p5G8V63X019608@svn.freebsd.org>
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Thu, 16 Jun 2011 08:31:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223143 - head/sbin/hastd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jun 2011 08:31:07 -0000

Author: sobomax
Date: Thu Jun 16 08:31:06 2011
New Revision: 223143
URL: http://svn.freebsd.org/changeset/base/223143

Log:
  Revert r222688.
  
  Requested by:	Mikolaj Golub

Modified:
  head/sbin/hastd/proto_common.c

Modified: head/sbin/hastd/proto_common.c
==============================================================================
--- head/sbin/hastd/proto_common.c	Thu Jun 16 07:27:13 2011	(r223142)
+++ head/sbin/hastd/proto_common.c	Thu Jun 16 08:31:06 2011	(r223143)
@@ -194,8 +194,6 @@ int
 proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp)
 {
 	ssize_t done;
-	size_t total_done, recvsize;
-	unsigned char *dp;
 
 	PJDLOG_ASSERT(sock >= 0);
 
@@ -212,19 +210,9 @@ proto_common_recv(int sock, unsigned cha
 	PJDLOG_ASSERT(data != NULL);
 	PJDLOG_ASSERT(size > 0);
 
-	total_done = 0;
-	dp = data;
 	do {
-		recvsize = size - total_done;
-		recvsize = recvsize < MAX_SEND_SIZE ? recvsize : MAX_SEND_SIZE;
-		done = recv(sock, dp, recvsize, MSG_WAITALL);
-		if (done == -1 && errno == EINTR)
-			continue;
-		if (done <= 0)
-			break;
-		total_done += done;
-		dp += done;
-	} while (total_done < size);
+		done = recv(sock, data, size, MSG_WAITALL);
+	} while (done == -1 && errno == EINTR);
 	if (done == 0) {
 		return (ENOTCONN);
 	} else if (done < 0) {