From 8e017e62a088d101b25d179ca3ff7592978bf362 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 10 Jun 2020 16:08:00 +0200
Subject: [SERVER] Likewise, flush entire payload on RTT measurement

---
 src/server/altservers.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/server/altservers.c b/src/server/altservers.c
index d4f41c0..fbbac81 100644
--- a/src/server/altservers.c
+++ b/src/server/altservers.c
@@ -596,7 +596,12 @@ static void altservers_findUplinkInternal(dnbd3_uplink_t *uplink)
 		}
 		// flush payload to include this into measurement
 		char buffer[DNBD3_BLOCK_SIZE];
-		if ( recv( sock, buffer, DNBD3_BLOCK_SIZE, MSG_WAITALL ) != DNBD3_BLOCK_SIZE ) {
+		uint32_t todo = length;
+		ssize_t ret;
+		while ( ( ret = recv( sock, buffer, MIN( DNBD3_BLOCK_SIZE, todo ), MSG_WAITALL ) ) > 0 ) {
+			todo -= (uint32_t)ret;
+		}
+		if ( todo != 0 ) {
 			ERROR_GOTO( image_failed, "[RTT%d] Could not read first block payload", server );
 		}
 		clock_gettime( BEST_CLOCK_SOURCE, &end );
-- 
cgit v1.2.3-55-g7522