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

cleanup some netty client code

Browse Source
This commit is contained in:
Moritz Zwerger 2024-01-19 21:35:08 +01:00
parent 74e52823f5
commit 406cbf3d59
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/de/bixilon/minosoft/protocol/network/network/client/netty/NettyClient.kt
View File

@ -84,9 +84,9 @@ class NettyClient(
override fun setupEncryption(encrypt: Cipher, decrypt: Cipher) {
if (encrypted) throw IllegalStateException("Already encrypted!")
val channel = requireChannel()
channel.pipeline().addBefore(LengthEncoder.NAME, PacketEncryptor.NAME, PacketEncryptor(encrypt))
channel.pipeline().addBefore(LengthDecoder.NAME, PacketDecryptor.NAME, PacketDecryptor(decrypt))
val pipeline = requireChannel().pipeline()
pipeline.addBefore(LengthEncoder.NAME, PacketEncryptor.NAME, PacketEncryptor(encrypt))
pipeline.addBefore(LengthDecoder.NAME, PacketDecryptor.NAME, PacketDecryptor(decrypt))
encrypted = true
}
@ -95,23 +95,19 @@ class NettyClient(
val pipeline = channel.pipeline()
if (threshold < 0) {
// disable
if (pipeline.get(PacketDeflater.NAME) != null) {
channel.pipeline().remove(PacketDeflater.NAME)
}
if (pipeline.get(PacketInflater.NAME) != null) {
channel.pipeline().remove(PacketInflater.NAME)
}
pipeline.remove(PacketDeflater.NAME)
pipeline.remove(PacketInflater.NAME)
} else {
// enable or update
val inflater = channel.pipeline()[PacketInflater.NAME]?.nullCast<PacketInflater>()
val inflater = pipeline[PacketInflater.NAME]?.nullCast<PacketInflater>()
if (inflater == null) {
channel.pipeline().addAfter(LengthDecoder.NAME, PacketInflater.NAME, PacketInflater(connection.version!!.maxPacketLength))
pipeline.addAfter(LengthDecoder.NAME, PacketInflater.NAME, PacketInflater(connection.version!!.maxPacketLength))
}
val deflater = channel.pipeline()[PacketDeflater.NAME]?.nullCast<PacketDeflater>()
if (deflater != null) {
deflater.threshold = threshold
val deflater = pipeline[PacketDeflater.NAME]?.nullCast<PacketDeflater>()
if (deflater == null) {
pipeline.addAfter(LengthEncoder.NAME, PacketDeflater.NAME, PacketDeflater(threshold))
} else {
channel.pipeline().addAfter(LengthEncoder.NAME, PacketDeflater.NAME, PacketDeflater(threshold))
deflater.threshold = threshold
}
}
}