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

Clientinit is finally being accepted

Browse Source 
[DEBUG] error id=525 msg=client\sis\smodified
This commit is contained in:
Manevolent
2018-07-27 13:27:40 -04:00
parent 7c1d0dfa4e
commit 146f2b6564
6 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/github/manevolent/ts3j/protocol/packet/handler/local/LocalClientHandlerConnecting.java
+9 -21
View File
@@ -151,6 +151,8 @@ public class LocalClientHandlerConnecting extends LocalClientHandler {
} else if (packet.getBody() instanceof PacketBody2Command) {
SimpleCommand command = ((PacketBody2Command) packet.getBody()).parse();
Ts3Debugging.debug(command.build());
if (command.getName().equalsIgnoreCase("initivexpand2")) {
// 3.2.2 initivexpand2 (Client <- Server)
@@ -160,9 +162,9 @@ public class LocalClientHandlerConnecting extends LocalClientHandler {
throw new IllegalArgumentException("ot constant != 1: " + command.get("ot").getValue());
byte[] license = Base64.getDecoder().decode(command.get("l").getValue());
byte[] licsense_validation = !command.has("tvd") ?
/*byte[] licsense_validation = !command.has("tvd") && command.get("tvd").getValue() != null ?
null :
Base64.getDecoder().decode(command.get("tvd").getValue());
Base64.getDecoder().decode(command.get("tvd").getValue());*/
byte[] beta = Base64.getDecoder().decode(command.get("beta").getValue()); // beta
byte[] omega = Base64.getDecoder().decode(command.get("omega").getValue()); // omega
@@ -187,29 +189,19 @@ public class LocalClientHandlerConnecting extends LocalClientHandler {
Ts3Debugging.debug("Sending clientek...");
PacketBody2Command clientek = new PacketBody2Command(ProtocolRole.CLIENT);
clientek.setText(
getClient().sendCommand(
new SimpleCommand(
"clientek", ProtocolRole.CLIENT,
new CommandSingleParameter("ek", Base64.getEncoder().encodeToString(keyPair.getKey())),
new CommandSingleParameter("proof", Base64.getEncoder().encodeToString(signature))
).build()
)
);
Ts3Debugging.debug(clientek.getText());
getClient().writePacket(clientek);
getClient().setSecureParameters(
Ts3Crypt.cryptoInit2(license, alphaBytes, omega, proof, beta, keyPair.getValue())
);
getClient().setSecureParameters(Ts3Crypt.cryptoInit2(license, alphaBytes, beta, keyPair.getValue()));
Ts3Debugging.debug("Sending clientinit...");
PacketBody2Command clientinit = new PacketBody2Command(ProtocolRole.CLIENT);
clientinit.setText(
new SimpleCommand(
getClient().sendCommand(new SimpleCommand(
"clientinit",
ProtocolRole.CLIENT,
new CommandSingleParameter("client_nickname", "test"),
@@ -235,12 +227,8 @@ public class LocalClientHandlerConnecting extends LocalClientHandler {
"hwid",
"+LyYqbDqOvJJpN5pdAbF8/v5kZ0="
)
).build()
)
);
Ts3Debugging.debug(clientinit.getText());
getClient().writePacket(clientinit);
}
}
}
src/main/java/com/github/manevolent/ts3j/protocol/socket/client/AbstractTeamspeakClientSocket.java
+35 -17
View File
@@ -5,6 +5,7 @@ import com.github.manevolent.ts3j.command.response.CommandResponse;
import com.github.manevolent.ts3j.identity.Identity;
import com.github.manevolent.ts3j.protocol.NetworkPacket;
import com.github.manevolent.ts3j.protocol.Packet;
import com.github.manevolent.ts3j.protocol.ProtocolRole;
import com.github.manevolent.ts3j.protocol.SocketRole;
import com.github.manevolent.ts3j.protocol.client.ClientConnectionState;
import com.github.manevolent.ts3j.protocol.header.ClientPacketHeader;
@@ -36,9 +37,9 @@ public abstract class AbstractTeamspeakClientSocket
private final Object connectionStateLock = new Object();
private final LinkedBlockingDeque<Packet> readQueue = new LinkedBlockingDeque<>(65536);
private final Map<PacketBodyType, Reassembly> reassemblyQueue = new LinkedHashMap<>();
private final Map<String, Object> clientOptions = new LinkedHashMap<>();
private final Map<Integer, PacketResponse> sendQueue = new LinkedHashMap<>();
private final Map<PacketBodyType, Reassembly> reassemblyQueue = new ConcurrentHashMap<>();
private final Map<String, Object> clientOptions = new ConcurrentHashMap<>();
private final Map<Integer, PacketResponse> sendQueue = new ConcurrentHashMap<>();
private Identity identity = null;
private ClientConnectionState connectionState = null;
@@ -153,12 +154,12 @@ public abstract class AbstractTeamspeakClientSocket
}
/**
* Sends a command to the remote server.
* Sends a command to the remote.
* @param command Command to send.
* @return Command response object to track command response.
* @throws IOException
*/
public CommandResponse sendCommand(Command command) throws IOException {
public CommandResponse sendCommand(Command command) throws IOException, TimeoutException {
if (command.willExpectResponse() && !isConnected())
throw new IOException("not connected");
@@ -175,9 +176,12 @@ public abstract class AbstractTeamspeakClientSocket
response.setDispatchedTime(System.currentTimeMillis());
writePacket(new PacketBody2Command(ProtocolRole.CLIENT, command));
return response;
}
@Override
public void writePacket(PacketBody body) throws IOException, TimeoutException {
PacketHeader header;
@@ -316,7 +320,7 @@ public abstract class AbstractTeamspeakClientSocket
// Find if the packet must be acknowledged and create a promise for that action
boolean willAcknowledge = packet.getHeader().getType().getAcknolwedgedBy() != null;
PacketResponse response;
final PacketResponse response;
if (willAcknowledge)
sendQueue.put(
@@ -342,15 +346,14 @@ public abstract class AbstractTeamspeakClientSocket
if (getState() == ClientConnectionState.DISCONNECTED)
throw new IllegalStateException("no longer connected");
response.getFuture().get(1000L, TimeUnit.MILLISECONDS);
// Wait one cycle for an ACK
response.waitForAcknowledgement(1000);
break;
} catch (TimeoutException e) {
response.resend();
} catch (CancellationException e) {
throw e;
} catch (InterruptedException e) {
} catch (ExecutionException e) {
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@@ -456,9 +459,11 @@ public abstract class AbstractTeamspeakClientSocket
// Find if the packet is itself an acknowledgement
switch (packet.getHeader().getType()) {
case ACK:
int packetId = packet.getHeader().getPacketId();
int packetId = ((PacketBody6Ack)packet.getBody()).getPacketId();
PacketResponse response = sendQueue.get(packetId);
if (response != null) response.getFuture().complete(packet);
if (response != null) {
response.acknowledge(packet);
}
break;
case ACK_LOW:
break;
@@ -578,9 +583,9 @@ public abstract class AbstractTeamspeakClientSocket
private class PacketResponse {
private final NetworkPacket sentPacket;
private final CompletableFuture future = new CompletableFuture<>();
private final CompletableFuture<Packet> future = new CompletableFuture<>();
private long lastSent = 0L;
private int tries, maxTries;
private int tries = 1, maxTries;
private boolean willResend;
public PacketResponse(NetworkPacket sentPacket,int maxTries) {
@@ -596,10 +601,23 @@ public abstract class AbstractTeamspeakClientSocket
public void resend() throws IOException {
AbstractTeamspeakClientSocket.this.writeNetworkPacket(sentPacket);
setLastSent(System.currentTimeMillis());
tries ++;
}
public boolean waitForAcknowledgement()
throws ExecutionException, InterruptedException {
Packet acknowledgement = future.get();
return acknowledgement != null;
}
public boolean waitForAcknowledgement(long millis)
throws TimeoutException, ExecutionException, InterruptedException {
Packet acknowledgement = future.get(millis, TimeUnit.MILLISECONDS);
return acknowledgement != null;
}
public boolean isWillResend() {
return willResend;
}
@@ -616,8 +634,8 @@ public abstract class AbstractTeamspeakClientSocket
return lastSent;
}
public CompletableFuture getFuture() {
return future;
public void acknowledge(Packet p) {
future.complete(p);
}
public void setLastSent(long lastSent) {
src/main/java/com/github/manevolent/ts3j/protocol/socket/client/LocalTeamspeakClientSocket.java
+1 -1
View File
@@ -102,7 +102,7 @@ public class LocalTeamspeakClientSocket extends AbstractTeamspeakClientSocket {
setGenerationId(0);
setOption("client.hostname", remote.getHostString());
setOption("client.password", password);
//setOption("client.password", password);
socket.connect(remote);
src/main/java/com/github/manevolent/ts3j/util/Ts3Crypt.java
-1
View File
@@ -56,7 +56,6 @@ public final class Ts3Crypt {
}
public static Ts3Crypt.SecureChannelParameters cryptoInit2(byte[] license, byte[] alpha,
byte[] omega, byte[] proof,
byte[] beta, byte[] privateKey) {
// 3.2.2.2 Parsing the license
List<License> licenses = License.readLicenses(ByteBuffer.wrap(license));