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

Update ts3j: survive packet loss during the handshake; allow 30 s to connect

Browse Source 
Picks up the ts3j fixes for "mac check in EAX failed" disconnects on lossy
links (retransmitted handshake packets now decrypt) and for the handshake
stalling when clientek's ACK is lost, plus tolerating an empty
client_servergroups.

The connect timeout also covers downloading the channel list, which on a
big server over mobile data can take longer than the previous 10 s.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ericek111
2026-09-23 23:21:52 +00:00
parent 9d996f48a2
commit 3187608579
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ts3-client/core/src/main/java/com/ts3client/net/TeamspeakConnection.java
View File

@@ -63,6 +63,12 @@ public final class TeamspeakConnection implements TS3Listener {
/** Shortest gap between two "you are talking while muted" reminders. */ /** Shortest gap between two "you are talking while muted" reminders. */
private static final long MUTED_TALK_COOLDOWN_NANOS = 5_000_000_000L; private static final long MUTED_TALK_COOLDOWN_NANOS = 5_000_000_000L;
/**
* How long the handshake and initial download may take. That download includes the whole
* channel list, which on a big server over a lossy link (mobile data) takes a while.
*/
private static final long CONNECT_TIMEOUT_MS = 30_000L;
private final Settings settings; private final Settings settings;
private final AudioBackend audio; private final AudioBackend audio;
private final ServerModel model = new ServerModel(); private final ServerModel model = new ServerModel();
@@ -293,7 +299,7 @@ public final class TeamspeakConnection implements TS3Listener {
ui.onStatus("Connecting to " + address + ":" + port + "…"); ui.onStatus("Connecting to " + address + ":" + port + "…");
client.connect(new InetSocketAddress(address, port), client.connect(new InetSocketAddress(address, port),
(password == null || password.isEmpty()) ? null : password, (password == null || password.isEmpty()) ? null : password,
10_000L); CONNECT_TIMEOUT_MS);
// Protocol connection established; anything past this point is best-effort. // Protocol connection established; anything past this point is best-effort.
selfClientId = client.getClientId(); selfClientId = client.getClientId();

2
ts3j

Submodule ts3j updated: b335c2c511...45cb8fd559