Merge pull request #1744 from davidBar-On/rcv-timeout-fix

Fix rcv-timeout issue because of Nread timeout
esnet · Sep 13, 2024 · 36deba4 · 36deba4
2 parents 7679199 + 9e4ccfb
commit 36deba4
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/iperf_api.c b/src/iperf_api.c
@@ -2060,8 +2060,14 @@ iperf_recv_mt(struct iperf_stream *sp)
 		i_errno = IESTREAMREAD;
 		return r;
 	    }
-	    test->bytes_received += r;
-	    ++test->blocks_received;
+
+            /* Collect statistics only if receive did not timeout (e.g. `Nread()` may timeout).
+             * This is also important for `--rcv-timeout` to work properly.
+             */
+            if (r > 0) {
+	        test->bytes_received += r;
+	        ++test->blocks_received;
+            }
 
     return 0;
 }