Upstream/VIAaaS
1
0
Fork 0
mirror of https://github.com/ViaVersion/VIAaaS.git synced 2024-10-04 05:38:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
creeper123123321 2020-08-16 17:41:59 -03:00
parent 29b1bf213f
commit eaefef295f
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/com/github/creeper123123321/viaaas/CloudPlatform.kt
View File

@ -37,7 +37,8 @@ object CloudLoader : ViaPlatformLoader {
} }
override fun load() { override fun load() {
Via.getManager().providers.use(MovementTransmitterProvider::class.java, BungeeMovementTransmitter()); Via.getManager().providers.use(MovementTransmitterProvider::class.java, BungeeMovementTransmitter())
Via.getManager().providers.use(VersionProvider::class.java, CloudVersionProvider)
} }
} }

30
src/main/kotlin/com/github/creeper123123321/viaaas/CloudProtocol.kt
View File

@ -7,12 +7,14 @@ import io.netty.channel.socket.SocketChannel
import io.netty.channel.socket.nio.NioSocketChannel import io.netty.channel.socket.nio.NioSocketChannel
import us.myles.ViaVersion.api.PacketWrapper import us.myles.ViaVersion.api.PacketWrapper
import us.myles.ViaVersion.api.Via import us.myles.ViaVersion.api.Via
import us.myles.ViaVersion.api.protocol.ProtocolRegistry
import us.myles.ViaVersion.api.protocol.ProtocolVersion import us.myles.ViaVersion.api.protocol.ProtocolVersion
import us.myles.ViaVersion.api.protocol.SimpleProtocol import us.myles.ViaVersion.api.protocol.SimpleProtocol
import us.myles.ViaVersion.api.remapper.PacketRemapper import us.myles.ViaVersion.api.remapper.PacketRemapper
import us.myles.ViaVersion.api.type.Type import us.myles.ViaVersion.api.type.Type
import us.myles.ViaVersion.packets.State import us.myles.ViaVersion.packets.State
import java.net.InetAddress import java.net.InetAddress
import java.net.InetSocketAddress
class CloudHandlerProtocol : SimpleProtocol() { class CloudHandlerProtocol : SimpleProtocol() {
override fun registerPackets() { override fun registerPackets() {
@ -61,6 +63,7 @@ class CloudHandlerProtocol : SimpleProtocol() {
foundDomain = true foundDomain = true
} }
} }
backAddr = backAddr.replace(Regex("\\.$"), "")
println("connecting ${wrapper.user().channel!!.remoteAddress()} ($protVer) to $backAddr:$port ($backProtocol)") println("connecting ${wrapper.user().channel!!.remoteAddress()} ($protVer) to $backAddr:$port ($backProtocol)")
@ -74,23 +77,31 @@ class CloudHandlerProtocol : SimpleProtocol() {
Via.getPlatform().runAsync { Via.getPlatform().runAsync {
val frontForwarder = wrapper.user().channel!!.pipeline().get(CloudSideForwarder::class.java) val frontForwarder = wrapper.user().channel!!.pipeline().get(CloudSideForwarder::class.java)
try { try {
val backInetAddr = InetAddress.getByName(backAddr) val socketAddr = InetSocketAddress(InetAddress.getByName(backAddr), svPort)
if (backInetAddr.isAnyLocalAddress) throw SecurityException("Local addresses aren't allowed") val addrInfo = socketAddr.address
if (addrInfo.isSiteLocalAddress
|| addrInfo.isLoopbackAddress
|| addrInfo.isLinkLocalAddress
|| addrInfo.isAnyLocalAddress) throw SecurityException("Local addresses aren't allowed")
val bootstrap = Bootstrap().handler(BackendInit(wrapper.user())) val bootstrap = Bootstrap().handler(BackendInit(wrapper.user()))
.channel(NioSocketChannel::class.java) .channel(NioSocketChannel::class.java)
.group(wrapper.user().channel!!.eventLoop()) .group(wrapper.user().channel!!.eventLoop())
.connect(backInetAddr, port) .connect(socketAddr)
println(backInetAddr)
bootstrap.addListener { bootstrap.addListener {
if (it.isSuccess) { if (it.isSuccess) {
println("conected ${wrapper.user().channel?.remoteAddress()} to $socketAddr")
val chann = bootstrap.channel() as SocketChannel val chann = bootstrap.channel() as SocketChannel
chann.pipeline().get(CloudSideForwarder::class.java).other = wrapper.user().channel chann.pipeline().get(CloudSideForwarder::class.java).other = wrapper.user().channel
frontForwarder.other = chann frontForwarder.other = chann
val backHandshake = ByteBufAllocator.DEFAULT.buffer() val backHandshake = ByteBufAllocator.DEFAULT.buffer()
try { try {
backHandshake.writeByte(0) // Packet 0 handshake backHandshake.writeByte(0) // Packet 0 handshake
Type.VAR_INT.writePrimitive(backHandshake, protVer) // client ver val connProto =
if (ProtocolRegistry.getProtocolPath(protVer, backProtocol) != null) {
backProtocol
} else protVer
Type.VAR_INT.writePrimitive(backHandshake, connProto)
val nullPos = addr.indexOf(0.toChar()) val nullPos = addr.indexOf(0.toChar())
Type.STRING.write(backHandshake, backAddr Type.STRING.write(backHandshake, backAddr
+ (if (nullPos != -1) addr.substring(nullPos) else "")) // Server Address + (if (nullPos != -1) addr.substring(nullPos) else "")) // Server Address
@ -123,12 +134,15 @@ class CloudHandlerProtocol : SimpleProtocol() {
override fun registerMap() { override fun registerMap() {
handler { handler {
val pipe = it.user().channel!!.pipeline() val pipe = it.user().channel!!.pipeline()
val threshold = it.passthrough(Type.VAR_INT) val threshold = it.read(Type.VAR_INT)
it.cancel()
it.create(3) {
it.write(Type.VAR_INT, threshold)
}.send(CloudHandlerProtocol::class.java)
pipe.get(CloudCompressor::class.java).threshold = threshold pipe.get(CloudCompressor::class.java).threshold = threshold
pipe.get(CloudDecompressor::class.java).threshold = threshold pipe.get(CloudDecompressor::class.java).threshold = threshold
val backPipe = it.user().channel!! val backPipe = pipe.get(CloudSideForwarder::class.java).other?.pipeline()
.pipeline().get(CloudSideForwarder::class.java).other?.pipeline()
backPipe?.get(CloudCompressor::class.java)?.threshold = threshold backPipe?.get(CloudCompressor::class.java)?.threshold = threshold
backPipe?.get(CloudDecompressor::class.java)?.threshold = threshold backPipe?.get(CloudDecompressor::class.java)?.threshold = threshold
} }