From 2c624b4e8236b41bc71340aa013d2e04e6076fb7 Mon Sep 17 00:00:00 2001
From: agnosticdev <agnosticdev@gmail.com>
Date: Sat, 13 Jun 2026 12:20:46 -0700
Subject: [PATCH] Fix QUICTransfer

---
 Sources/Tools/QUICTransfer/main.swift | 71 ++++++++++++++-------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/Sources/Tools/QUICTransfer/main.swift b/Sources/Tools/QUICTransfer/main.swift
index f1e32fc..3c20b0c 100644
--- a/Sources/Tools/QUICTransfer/main.swift
+++ b/Sources/Tools/QUICTransfer/main.swift
@@ -224,44 +224,49 @@ final class QUICTransfer {
                     maximumBurst: 10
                 )
             }
-            // Transfer all of the data
-            for _ in 0..<iterations {
-                group.enter()
-                let writeSuccess = clientInput.write(payload)
-                guard writeSuccess else {
+            // Process all of the reads until finished
+            func runNextIteration(_ iterationIndex: Int, readDataSize: Int) {
+                guard iterationIndex < iterations else {
+                    clientInput.stop()
+                    clientInput.teardown()
+                    serverInput.stop()
+                    serverInput.teardown()
                     group.leave()
-                    print("Issue took place writing to the client")
-                    break
+                    return
                 }
-                var payloadReceived = false
-                var readDataSize = 0
-                while !payloadReceived {
-                    let _ = self.dataBenchmarkUtility.loopOutputHandlerPackets(
-                        sender: clientOutput,
-                        receiver: serverOutput,
-                        maximumBurst: 50
-                    )
-                    let _ = self.dataBenchmarkUtility.loopOutputHandlerPackets(
-                        sender: serverOutput,
-                        receiver: clientOutput,
-                        maximumBurst: 50
-                    )
-
-                    if let readBytes = serverInput.upperHarnesses.first?.readAndDrop() {
-                        readDataSize += readBytes
-                        if readDataSize == sendSize {
-                            payloadReceived = true
-                        }
+                // Just write the whole payload when read size is 0
+                if readDataSize == 0 {
+                    group.enter()
+                    guard clientInput.write(payload) else {
+                        group.leave()
+                        print("Issue took place writing to the client")
+                        return
+                    }
+                }
+                let _ = self.dataBenchmarkUtility.loopOutputHandlerPackets(
+                    sender: clientOutput,
+                    receiver: serverOutput,
+                    maximumBurst: 50
+                )
+                let _ = self.dataBenchmarkUtility.loopOutputHandlerPackets(
+                    sender: serverOutput,
+                    receiver: clientOutput,
+                    maximumBurst: 50
+                )
+                context.async {
+                    let newBytes = serverInput.upperHarnesses.first?.readAndDrop() ?? 0
+                    let totalRead = readDataSize + newBytes
+                    if totalRead >= sendSize {
+                        index += 1
+                        group.leave()
+                        // Finish here
+                        runNextIteration(iterationIndex + 1, readDataSize: 0)
+                    } else {
+                        runNextIteration(iterationIndex, readDataSize: totalRead)
                     }
                 }
-                index += 1
-                group.leave()
             }
-            clientInput.stop()
-            clientInput.teardown()
-            serverInput.stop()
-            serverInput.teardown()
-            group.leave()
+            runNextIteration(0, readDataSize: 0)
         }
         group.wait()
         print("Completed \(index) / \(iterations) transfers")