From 9787bccc217ee7369d20e5a4c243d433ae4b70bd Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 22 Aug 2019 10:30:07 +0200
Subject: [SERVER] Put request handle into CMD_ERROR reply

---
 src/server/net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/net.c b/src/server/net.c
index 5de9f14..7f3c1ce 100644
--- a/src/server/net.c
+++ b/src/server/net.c
@@ -314,6 +314,7 @@ void* net_handleNewConnection(void *clientPtr)
 
 			case CMD_GET_BLOCK:;
 				const uint64_t offset = request.offset_small; // Copy to full uint64 to prevent repeated masking
+				reply.handle = request.handle;
 				if ( offset >= image->virtualFilesize ) {
 					// Sanity check
 					logadd( LOG_WARNING, "Client %s requested non-existent block", client->hostName );
@@ -395,7 +396,6 @@ void* net_handleNewConnection(void *clientPtr)
 
 				reply.cmd = CMD_GET_BLOCK;
 				reply.size = request.size;
-				reply.handle = request.handle;
 
 				fixup_reply( reply );
 				const bool lock = image->uplink != NULL;
-- 
cgit v1.2.3-55-g7522