diff options
| author | Simon Rettberg | 2020-06-10 16:08:00 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2020-06-10 16:08:00 +0200 |
| commit | 8e017e62a088d101b25d179ca3ff7592978bf362 (patch) | |
| tree | 48263825a6e6cd58d08440cc1010970448ebcf11 /src | |
| parent | [SERVER] Fix list walk when removing client from uplink (diff) | |
| download | dnbd3-8e017e62a088d101b25d179ca3ff7592978bf362.tar.gz dnbd3-8e017e62a088d101b25d179ca3ff7592978bf362.tar.xz dnbd3-8e017e62a088d101b25d179ca3ff7592978bf362.zip | |
[SERVER] Likewise, flush entire payload on RTT measurement
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/altservers.c | 7 |
1 files changed, 6 insertions, 1 deletions
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 ); |