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

viaaas address code cleanup

Browse Source
This commit is contained in:
creeper123123321 2021-02-07 12:00:25 -03:00
parent a2e90f79d0
commit f37bace7af
2 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/com/github/creeper123123321/viaaas/CloudHandler.kt
View File

@ -133,7 +133,7 @@ class HandshakeState : MinecraftConnectionState {
val backProto = parsed.protocol ?: 47 // todo autodetection
val hadHostname = parsed.viaSuffix != null
packet.address = parsed.realAddress!!
packet.address = parsed.serverAddress!!
packet.port = parsed.port ?: if (VIAaaSConfig.defaultBackendPort == -1) {
packet.port
} else {
@ -142,7 +142,7 @@ class HandshakeState : MinecraftConnectionState {
handler.data.backVer = backProto
handler.data.frontOnline = parsed.online
handler.data.backName = parsed.altUsername
handler.data.backName = parsed.username
val playerAddr = handler.data.frontHandler.remoteAddress
mcLogger.info("Connecting $playerAddr (${handler.data.frontVer}) -> ${packet.address}:${packet.port} ($backProto)")

114
src/main/kotlin/com/github/creeper123123321/viaaas/VIAaaS.kt
View File

@ -294,68 +294,68 @@ object VIAaaSConfig : Config(File("config/viaaas.yml")) {
}
class VIAaaSAddress {
var protocol: Int? = null
var serverAddress: String? = null
var viaSuffix: String? = null
var realAddress: String? = null
var viaOptions: String? = null
var protocol: Int? = null
var port: Int? = null
var online = true
var altUsername: String? = null
var online: Boolean? = null
var username: String? = null
fun parse(address: String, viaHostName: String): VIAaaSAddress {
val parts = address.split('.')
var foundDomain = false
var foundOptions = false
val ourParts = StringBuilder()
val realAddrBuilder = StringBuilder()
for (i in parts.indices.reversed()) {
val part = parts[i]
var realAddrPart = false
if (foundDomain) {
if (!foundOptions) {
if (part.startsWith("_")) {
val arg = part.substring(2)
when {
part.startsWith("_p", ignoreCase = true) -> port = arg.toInt()
part.startsWith("_o", ignoreCase = true) -> online = arg.toBoolean()
part.startsWith("_v", ignoreCase = true) -> {
try {
protocol = arg.toInt()
} catch (e: NumberFormatException) {
val closest = ProtocolVersion.getClosest(arg.replace("_", "."))
if (closest != null) {
protocol = closest.version
}
}
}
part.startsWith("_u", ignoreCase = true) -> {
if (arg.length > 16) throw IllegalArgumentException("Invalid alt username")
altUsername = arg
}
}
} else {
foundOptions = true
}
}
if (foundOptions) {
realAddrPart = true
}
} else if (parts.filterIndexed { a, _ -> a >= i }
.joinToString(".").equals(viaHostName, ignoreCase = true)) {
foundDomain = true
}
if (realAddrPart) {
realAddrBuilder.insert(0, "$part.")
val suffixRemoved = address.removeSuffix(".$viaHostName")
if (suffixRemoved == address) {
serverAddress = address
return this
}
var endOfOptions = false
val optionsList = arrayListOf<String>()
serverAddress = suffixRemoved.split('.').asReversed().filter {
if (endOfOptions || !parseOption(it)) {
endOfOptions = true
true
} else {
ourParts.insert(0, "$part.")
optionsList.add(it)
false
}
}
val realAddr = realAddrBuilder.toString().replace("\\.$".toRegex(), "")
val suffix = ourParts.toString().replace("\\.$".toRegex(), "")
if (realAddr.isEmpty()) {
realAddress = address
} else {
realAddress = realAddr
viaSuffix = suffix
}
}.asReversed().joinToString(".")
viaOptions = optionsList.asReversed().joinToString(".")
viaSuffix = viaHostName
return this
}
fun parseOption(part: String): Boolean {
if (part.startsWith("_")) {
val arg = part.substring(2)
when {
part.startsWith("_p", ignoreCase = true) -> port = arg.toInt()
part.startsWith("_o", ignoreCase = true) -> {
online = when {
arg.startsWith("t", ignoreCase = true) -> true
arg.startsWith("f", ignoreCase = true) -> false
else -> null
}
}
part.startsWith("_v", ignoreCase = true) -> {
try {
protocol = arg.toInt()
} catch (e: NumberFormatException) {
ProtocolVersion.getClosest(arg.replace("_", "."))?.also {
protocol = it.version
}
}
}
part.startsWith("_u", ignoreCase = true) -> {
if (arg.length > 16) throw IllegalArgumentException("Invalid username")
username = arg
}
}
return true
}
return false
}
}