github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-23 10:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseResendPacket.kt
This commit is contained in:
Him188moe 2019-08-18 22:04:02 +08:00
commit 71750d43a4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/login/ServerLoginResponseResendPacket.kt
View File

@ -5,7 +5,7 @@ import net.mamoe.mirai.network.packet.server.ServerPacket
import net.mamoe.mirai.network.packet.server.dataInputStream import net.mamoe.mirai.network.packet.server.dataInputStream
import net.mamoe.mirai.network.packet.server.goto import net.mamoe.mirai.network.packet.server.goto
import net.mamoe.mirai.util.TEACryptor import net.mamoe.mirai.util.TEACryptor
import java.io.DataInputStream yaimport java.io.DataInputStream
/** /**
* @author Him188moe * @author Him188moe
@ -22,20 +22,20 @@ class ServerLoginResponseResendPacket(input: DataInputStream, val flag: Flag) :
lateinit var tgtgtKey: ByteArray lateinit var tgtgtKey: ByteArray
override fun decode() {//todo 检查 override fun decode() {//todo 检查
this.input.skip(8) this.input.skip(5)
tgtgtKey = this.input.readNBytes(13) tgtgtKey = this.input.readNBytes(16)//22
this.input.skip(17) this.input.skip(3)//25
_0836_tlv0006_encr = this.input.readNBytes(120)
_0836_tlv0006_encr = this.input.readNBytes(179)
when (flag) { when (flag) {
Flag.`08 36 31 03` -> { Flag.`08 36 31 03` -> {
this.input.skip(13) token = this.input.goto(153).readNBytes(56)
token = this.input.readNBytes(83)
} }
Flag.OTHER -> { Flag.OTHER -> {
//do nothing in this packet. //do nothing in this packet.
//[this.token] will be set in [Robot] //[this.token] will be set in [Robot]
//token
} }
} }
} }

4
mirai-core/src/test/java/PacketTest.kt
View File

@ -41,6 +41,6 @@ fun main(){
println(packet.verifyCode.toUByteArray().toHexString(" ")) println(packet.verifyCode.toUByteArray().toHexString(" "))
println(packet.verifyCodeLength) println(packet.verifyCodeLength)
File("C:\\Users\\Him18\\Desktop\\5.png").createNewFile() File(System.getProperty("user.dir") + "/5.png").createNewFile()
packet.verifyCode.inputStream().transferTo(FileOutputStream("C:\\Users\\Him18\\Desktop\\5.png")) packet.verifyCode.inputStream().transferTo(FileOutputStream(System.getProperty("user.dir") + "/5.png"))
} }