From ed39518381ca5cf147552b93a961a4ea3b36a72c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 28 Aug 2013 19:22:50 +0200
Subject: [SERVER] Properly receive complete crc32 list

---
 src/server/protocol.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/server')

diff --git a/src/server/protocol.h b/src/server/protocol.h
index c8010ab..5544876 100644
--- a/src/server/protocol.h
+++ b/src/server/protocol.h
@@ -74,8 +74,14 @@ static inline int dnbd3_get_crc32(int sock, uint32_t *master, void *buffer, size
 	reply.size -= 4;
 	if ( reply.cmd != CMD_GET_CRC32 || reply.size > *bufferLen ) return FALSE;
 	*bufferLen = reply.size;
-	return recv( sock, master, sizeof(uint32_t), 0 ) == sizeof(uint32_t)
-	        && recv( sock, buffer, reply.size, 0 ) == (int)reply.size;
+	if ( recv( sock, master, sizeof(uint32_t), MSG_WAITALL ) != sizeof(uint32_t) ) return FALSE;
+	int done = 0;
+	while ( done < reply.size ) {
+		const int ret = recv( sock, buffer, reply.size, 0 );
+		if ( ret <= 0 ) return FALSE;
+		done += ret;
+	}
+	return TRUE;
 }
 
 /**
-- 
cgit v1.2.3-55-g7522