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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
liujiahua123123 2019-08-17 20:17:47 +08:00
commit 815d966b9a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/Client0825ResponsePacket.kt
View File

@ -9,6 +9,7 @@ import java.io.IOException
/** /**
* @author Him188moe @ Mirai Project * @author Him188moe @ Mirai Project
*/ */
@ExperimentalUnsignedTypes
@PacketId(0x08_25_31_02) @PacketId(0x08_25_31_02)
class Client0825ResponsePacket(private val serverIP: String, private val qq: Int) : ClientPacket() { class Client0825ResponsePacket(private val serverIP: String, private val qq: Int) : ClientPacket() {
@ExperimentalUnsignedTypes @ExperimentalUnsignedTypes

1
mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientPacket.kt
View File

@ -11,6 +11,7 @@ import java.io.IOException
/** /**
* @author Him188moe @ Mirai Project * @author Him188moe @ Mirai Project
*/ */
@ExperimentalUnsignedTypes
abstract class ClientPacket : ByteArrayDataOutputStream(), Packet { abstract class ClientPacket : ByteArrayDataOutputStream(), Packet {
@Getter @Getter
val packageId: Int val packageId: Int

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

@ -1,7 +1,5 @@
package net.mamoe.mirai.network.packet.server package net.mamoe.mirai.network.packet.server
import net.mamoe.mirai.network.Protocol
import net.mamoe.mirai.util.TEACryptor
import net.mamoe.mirai.util.getRandomKey import net.mamoe.mirai.util.getRandomKey
import java.io.DataInputStream import java.io.DataInputStream
@ -25,11 +23,12 @@ class Server0825Packet(private val type: Type, inputStream: DataInputStream) : S
@ExperimentalUnsignedTypes @ExperimentalUnsignedTypes
override fun decode() { override fun decode() {
input.skip(43 - 11)//todo: check /*input.skip(43 - 11)//todo: check
val data = DataInputStream(TEACryptor.decrypt(input.readAllBytes().let { it.copyOfRange(0, it.size - 2) }, when (type) {//todo: check array range val data = DataInputStream(TEACryptor.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());*/
val data = input;
when (data.readByte().toInt()) { when (data.readByte().toInt()) {
0xFE -> { 0xFE -> {