Enhance debugger tools

This commit is contained in:
Him188 2020-01-29 21:52:22 +08:00
parent 47e02cd2f1
commit fb1b37520b

View File

@ -95,19 +95,24 @@ private fun processFullPacketWithoutLength(packet: ByteReadPacket) {
val bytes = it.data.readBytes() val bytes = it.data.readBytes()
if (flag2 == 2 && it.packetFactory != null) { if (flag2 == 2 && it.packetFactory != null) {
PacketLogger.debug("Oicq Reuqest= " + bytes.toUHexString()) PacketLogger.debug("Oicq Reuqest= " + bytes.toUHexString())
try{ try {
bytes.toReadPacket().parseOicqResponse { bytes.toReadPacket().parseOicqResponse {
if (it.packetFactory.commandName == "wtlogin.login") { debugIfFail {
DebugLogger.info("服务器发来了 wtlogin.login. 正在解析 key") if (it.packetFactory.commandName == "wtlogin.login") {
try { DebugLogger.info("服务器发来了 wtlogin.login. 正在解析 key")
val subCommand = readUShort().toInt() try {
println("subCommand=$subCommand") val subCommand = readUShort().toInt()
val type = readUByte().toInt() println("subCommand=$subCommand")
println("type=$type") val type = readUByte().toInt()
if (type == 0) { println("type=$type")
discardExact(2) discardExact(2)
val tlvMap: Map<Int, ByteArray> = this.readTLVMap() val tlvMap: Map<Int, ByteArray> = this.readTLVMap()
println("tlvMap: ")
tlvMap.forEach {
println(it.key.toShort().toUHexString() + " = " + it.value.toUHexString())
}
tlvMap[0x119]?.let { t119Data -> tlvMap[0x119]?.let { t119Data ->
t119Data.decryptBy(tgtgtKey).toReadPacket().debugPrint("0x119data").apply { t119Data.decryptBy(tgtgtKey).toReadPacket().debugPrint("0x119data").apply {
discardExact(2) // always discarded. 00 1C discardExact(2) // always discarded. 00 1C
@ -123,9 +128,9 @@ private fun processFullPacketWithoutLength(packet: ByteReadPacket) {
DebugLogger.info("D2Key=${D2Key.toUHexString()}") DebugLogger.info("D2Key=${D2Key.toUHexString()}")
} }
} }
} catch (e: Exception) {
e.printStackTrace()
} }
} catch (e: Exception) {
e.printStackTrace()
} }
} }
} }