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

Init1 changes to make it neater

Browse Source
This commit is contained in:
Manevolent
2018-09-17 23:41:28 -04:00
parent 127ae9bc8f
commit 66bc483490
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/github/manevolent/ts3j/protocol/packet/PacketBody8Init1.java
+6
View File
@@ -19,6 +19,12 @@ public class PacketBody8Init1 extends PacketBody {
super(INIT1, role); super(INIT1, role);
} }
public PacketBody8Init1(ProtocolRole role, Step step) {
this(role);
setStep(step);
}
public byte[] getVersion() { public byte[] getVersion() {
return version; return version;
} }
src/main/java/com/github/manevolent/ts3j/protocol/packet/handler/client/LocalClientHandlerConnecting.java
+6 -11
View File
@@ -60,6 +60,7 @@ public class LocalClientHandlerConnecting extends LocalClientHandler {
PacketBody8Init1 init1 = (PacketBody8Init1) packet.getBody(); PacketBody8Init1 init1 = (PacketBody8Init1) packet.getBody();
Ts3Debugging.debug("Handle Init1 step " + init1.getStep().getNumber()); Ts3Debugging.debug("Handle Init1 step " + init1.getStep().getNumber());
PacketBody8Init1.Step step;
switch (init1.getStep().getNumber()) { switch (init1.getStep().getNumber()) {
case 1: case 1:
@@ -74,14 +75,11 @@ public class LocalClientHandlerConnecting extends LocalClientHandler {
} }
// Build response // Build response
PacketBody8Init1 response2 = new PacketBody8Init1(ProtocolRole.CLIENT);
PacketBody8Init1.Step2 step2 = new PacketBody8Init1.Step2(); PacketBody8Init1.Step2 step2 = new PacketBody8Init1.Step2();
step2.setA0reversed(serverReplyStep1.getA0reversed()); step2.setA0reversed(serverReplyStep1.getA0reversed());
step2.setServerStuff(serverReplyStep1.getServerStuff()); step2.setServerStuff(serverReplyStep1.getServerStuff());
response2.setStep(step2); step = step2;
sendInit1(response2);
break; break;
case 3: case 3:
PacketBody8Init1.Step3 serverReplyStep3 = (PacketBody8Init1.Step3)init1.getStep(); PacketBody8Init1.Step3 serverReplyStep3 = (PacketBody8Init1.Step3)init1.getStep();
@@ -110,8 +108,6 @@ public class LocalClientHandlerConnecting extends LocalClientHandler {
); );
// Build response // Build response
PacketBody8Init1 response4 = new PacketBody8Init1(ProtocolRole.CLIENT);
PacketBody8Init1.Step4 step4 = new PacketBody8Init1.Step4(); PacketBody8Init1.Step4 step4 = new PacketBody8Init1.Step4();
step4.setLevel(serverReplyStep3.getLevel()); step4.setLevel(serverReplyStep3.getLevel());
@@ -140,17 +136,16 @@ public class LocalClientHandlerConnecting extends LocalClientHandler {
step4.setClientIVcommand(initiv.build().getBytes(Charset.forName("UTF8"))); step4.setClientIVcommand(initiv.build().getBytes(Charset.forName("UTF8")));
response4.setStep(step4); step = step4;
sendInit1(response4);
break; break;
case 127: case 127:
onAssigned(); onAssigned();
break; return;
default: default:
throw new IllegalArgumentException("unexpected Init1 server step: " + init1.getStep().getNumber()); throw new IllegalArgumentException("unexpected Init1 server step: " + init1.getStep().getNumber());
} }
sendInit1(new PacketBody8Init1(getClient().getRole().getOut(), step));
} else if (packet.getBody() instanceof PacketBody2Command) { } else if (packet.getBody() instanceof PacketBody2Command) {
SingleCommand command = ((PacketBody2Command) packet.getBody()).parse().simplifyOne(); SingleCommand command = ((PacketBody2Command) packet.getBody()).parse().simplifyOne();