ericek111/ts3java
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Fail a download whose file server stops sending

Browse Source 
The data socket had no read timeout, so a file server that went quiet
left the transfer, and its thread, waiting until the user cancelled.
Thirty seconds without data now fails it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ericek111
2026-09-25 10:55:56 +00:00
parent 48a0032848
commit ae8d1f7083
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ts3-client/core/src/main/java/com/ts3client/net/filetransfer/FileTransferManager.java
View File

@@ -46,6 +46,8 @@ import java.util.function.Supplier;
public final class FileTransferManager { public final class FileTransferManager {
private static final int CONNECT_TIMEOUT_MS = 15_000; private static final int CONNECT_TIMEOUT_MS = 15_000;
/** How long a download may go without receiving anything before it counts as failed. */
private static final int STALL_TIMEOUT_MS = 30_000;
private static final int BUFFER_SIZE = 64 * 1024; private static final int BUFFER_SIZE = 64 * 1024;
/** How long to wait for the server's {@code notifystart*} reply after an {@code ftinit*}. */ /** How long to wait for the server's {@code notifystart*} reply after an {@code ftinit*}. */
private static final long NEGOTIATE_TIMEOUT_MS = 15_000; private static final long NEGOTIATE_TIMEOUT_MS = 15_000;
@@ -406,6 +408,7 @@ public final class FileTransferManager {
Socket socket = new Socket(); Socket socket = new Socket();
socket.connect(new InetSocketAddress(resolveHost(params.getFileServerHost()), socket.connect(new InetSocketAddress(resolveHost(params.getFileServerHost()),
params.getFileServerPort()), CONNECT_TIMEOUT_MS); params.getFileServerPort()), CONNECT_TIMEOUT_MS);
socket.setSoTimeout(STALL_TIMEOUT_MS);
return socket; return socket;
} }