AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-13 01:16:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

handling of broken packets

Browse Source
This commit is contained in:
bixilon 2020-06-03 14:28:32 +02:00
parent 11f95213d3
commit 3d5a1249da
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/de/bixilon/minosoft/protocol/network/Network.java
View File

@ -136,29 +136,32 @@ public class Network {
while (binQueueIn.size() > 0) {
// read data
byte[] raw = binQueueIn.get(0);
byte[] decrypted = binQueueIn.get(0);
InPacketBuffer inPacketBuffer;
if (encryptionEnabled) {
// decrypt
byte[] decrypted = cipherDecrypt.update(raw);
inPacketBuffer = new InPacketBuffer(decrypted);
} else {
inPacketBuffer = new InPacketBuffer(raw);
}
Packets.Clientbound p = connection.getVersion().getProtocol().getPacketByCommand(connection.getConnectionState(), inPacketBuffer.getCommand());
Class<? extends ClientboundPacket> clazz = Protocol.getPacketByPacket(p);
if (clazz == null) {
Log.warn(String.format("[IN] Unknown packet with command 0x%x (%s)", inPacketBuffer.getCommand(), ((p != null) ? p.name() : "UNKNOWN")));
binQueueIn.remove(0);
continue;
decrypted = cipherDecrypt.update(decrypted);
}
try {
ClientboundPacket packet = clazz.getConstructor().newInstance();
packet.read(inPacketBuffer, connection.getVersion());
connection.handle(packet);
} catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
// safety first, but will not occur
inPacketBuffer = new InPacketBuffer(decrypted);
Packets.Clientbound p = connection.getVersion().getProtocol().getPacketByCommand(connection.getConnectionState(), inPacketBuffer.getCommand());
Class<? extends ClientboundPacket> clazz = Protocol.getPacketByPacket(p);
if (clazz == null) {
Log.warn(String.format("[IN] Unknown packet with command 0x%x (%s)", inPacketBuffer.getCommand(), ((p != null) ? p.name() : "UNKNOWN")));
binQueueIn.remove(0);
continue;
}
try {
ClientboundPacket packet = clazz.getConstructor().newInstance();
packet.read(inPacketBuffer, connection.getVersion());
connection.handle(packet);
} catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
// safety first, but will not occur
e.printStackTrace();
}
} catch (ArrayIndexOutOfBoundsException e) {
Log.protocol("Received broken packet!");
e.printStackTrace();
}