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

update

Browse Source
This commit is contained in:
Him188moe 2019-08-16 00:15:41 +08:00
parent 97b90b08c8
commit c110c2331a
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core/src/main/java/net/mamoe/mirai/network/ClientHandler.kt
View File

@ -16,7 +16,7 @@ class ClientHandler(val robot: Robot) : SimpleChannelInboundHandler<ByteArray>()
private lateinit var bytes: ByteArray private lateinit var bytes: ByteArray
fun init(bytes: ByteArray) { fun init(bytes: ByteArray) {
this.length = length this.length = bytes.size
this.bytes = bytes this.bytes = bytes
} }

2
mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt
View File

@ -23,7 +23,7 @@ class Robot(val number: Long) {
} }
} }
internal fun sendPacket(packet: Packet) { private fun sendPacket(packet: Packet) {
TODO() TODO()
} }
} }

12
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/Server0825Packet.kt
View File

@ -12,6 +12,11 @@ import java.io.DataInputStream
class Server0825Packet(private val type: Type, inputStream: DataInputStream) : ServerPacket(inputStream) { class Server0825Packet(private val type: Type, inputStream: DataInputStream) : ServerPacket(inputStream) {
lateinit var serverIP: String; lateinit var serverIP: String;
var loginTime: Long = 0;
lateinit var loginIP: String;
lateinit var token: ByteArray;
lateinit var tgtgtKey: ByteArray
enum class Type { enum class Type {
TYPE_08_25_31_01, TYPE_08_25_31_01,
TYPE_08_25_31_02, TYPE_08_25_31_02,
@ -19,7 +24,7 @@ class Server0825Packet(private val type: Type, inputStream: DataInputStream) : S
override fun decode() { override fun decode() {
input.skip(43 - 11)//todo: check input.skip(43 - 11)//todo: check
val data = DataInputStream(TEAEncryption.decrypt(input.readAllBytes().let { it.copyOfRange(0, it.size - 45) }, when (type) { val data = DataInputStream(TEAEncryption.decrypt(input.readAllBytes().let { it.copyOfRange(0, it.size - 2) }, when (type) {//todo: check array range
Type.TYPE_08_25_31_01 -> Protocol.redirectionKey.toByteArray() Type.TYPE_08_25_31_01 -> Protocol.redirectionKey.toByteArray()
Type.TYPE_08_25_31_02 -> Protocol._0825key.toByteArray() Type.TYPE_08_25_31_02 -> Protocol._0825key.toByteArray()
}).inputStream()); }).inputStream());
@ -29,7 +34,12 @@ class Server0825Packet(private val type: Type, inputStream: DataInputStream) : S
serverIP = data.readIP() serverIP = data.readIP()
} }
0X00 -> { 0X00 -> {
data.skip(16 - 2)
token = data.readNBytes(167 - (16 - 2))
loginTime = data.readLong()//todo check
loginIP = data.readIP()
TODO("从易语言抄协议来")
} }
else -> { else -> {
} }