From fce4bbc86bc9882db552f3df2ec5e5cb66554775 Mon Sep 17 00:00:00 2001
From: liujiahua123123 <liujiahua123123@126.com>
Date: Sat, 17 Aug 2019 22:30:02 +0800
Subject: [PATCH 1/3] fix
---
.../java/net/mamoe/mirai/network/packet/server/ServerPacket.kt | 2 +-
mirai-core/src/test/java/NetworkTest.java | 1 -
mirai-core/src/test/java/PacketTest.kt | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
index 28f14998c..e974fdb5e 100644
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
@@ -54,7 +54,7 @@ fun DataInputStream.readIP(): String {
val byte = readByte();
buff += (byte.toUByte().toString())
if(i !=3)buff+="."
- System.out.println(byte.toHexString())
+ //System.out.println(byte.toHexString())
}
return buff
}
diff --git a/mirai-core/src/test/java/NetworkTest.java b/mirai-core/src/test/java/NetworkTest.java
index d2a6055ea..3c48128b0 100644
--- a/mirai-core/src/test/java/NetworkTest.java
+++ b/mirai-core/src/test/java/NetworkTest.java
@@ -34,5 +34,4 @@ public class NetworkTest {
}
-
}
diff --git a/mirai-core/src/test/java/PacketTest.kt b/mirai-core/src/test/java/PacketTest.kt
index 423d771d5..27757ff9e 100644
--- a/mirai-core/src/test/java/PacketTest.kt
+++ b/mirai-core/src/test/java/PacketTest.kt
@@ -8,7 +8,7 @@ import java.io.DataInputStream
@ExperimentalUnsignedTypes
fun main(){
- val data = "00 37 13 08 25 31 01 76 E4 B8 DD 03 00 00 00 01 2E 01 00 00 68 52 00 00 00 00 A4 F1 91 88 C9 82 14 99 0C 9E 56 55 91 23 C8 3D C3 47 F0 25 A1 8E 74 EF 1E 0B 32 5B 20 8A FA 3B 0B 52 8F 86 E6 04 F1 D6 F8 63 75 60 8C 0C 7D 06 D1 E0 22 F8 49 EF AF 61 EE 7E 69 72 EB 10 08 30 69 50 1C 84 A9 C2 16 D7 52 B9 1C 79 CA 5A CF FD BC AE D8 A6 BB DC 21 6E 79 26 E1 A2 23 11 AA B0 9A 49 39 72 ED 61 12 B6 88 4D A2 56 23 E9 92 11 92 27 4A 70 00 C9 01 7B 03"
+ val data = "00 37 13 08 25 31 01 EB 10 08 30 69 50 1C 84 A9 C2 16 D7 52 B9 1C 79 CA 5A CF FD BC EB 10 08 30 69 50 1C 84 A9 C2 16 D7 52 B9 1C 79 CA 5A CF FD BC AE D8 A6 BB DC 21 6E 79 26 E1 A2 23 11 AA B0 9A AE D8 A6 BB DC 21 6E 79 26 E1 A2 23 11 AA B0 9A 76 E4 B8 DD 03 00 00 00 01 2E 01 00 00 68 52 00 00 00 00 A4 F1 91 88 C9 82 14 99 0C 9E 56 55 91 23 C8 3D C3 47 F0 25 A1 8E 74 EF 1E 0B 32 5B 20 8A FA 3B 0B 52 8F 86 E6 04 F1 D6 F8 63 75 60 8C 0C 7D 06 D1 E0 22 F8 49 EF AF 61 EE 7E 69 72 EB 10 08 30 69 50 1C 84 A9 C2 16 D7 52 B9 1C 79 CA 5A CF FD BC AE D8 A6 BB DC 21 6E 79 26 E1 A2 23 11 AA B0 9A 49 39 72 ED 61 12 B6 88 4D A2 56 23 E9 92 11 92 27 4A 70 00 C9 01 7B 03";
val s = DataInputStream(data.hexToBytes().inputStream())
val packet = Server0825Packet(Server0825Packet.Type.TYPE_08_25_31_01,s)
packet.decode()
From 22d82db79317224d45dd5ffbcc24c83860c03cda Mon Sep 17 00:00:00 2001
From: liujiahua123123 <liujiahua123123@126.com>
Date: Sat, 17 Aug 2019 22:59:54 +0800
Subject: [PATCH 2/3] remove ; ->
---
.../packet/client/ClientPasswordSubmissionPacket.kt | 12 ++++++------
mirai-core/src/test/java/PacketTest.kt | 5 +++++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientPasswordSubmissionPacket.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientPasswordSubmissionPacket.kt
index fb633157e..b06f34b1a 100644
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientPasswordSubmissionPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientPasswordSubmissionPacket.kt
@@ -32,12 +32,12 @@ class ClientPasswordSubmissionPacket(private val qq: Int, private val password:
val hostName: String = InetAddress.getLocalHost().hostName.let { it.substring(0, it.length - 3) };
this.writeQQ(System.currentTimeMillis().toInt())//that's correct
- this.writeHex("01 12");//tag
- this.writeHex("00 38");//length
- this.write(token0825);//length
- this.writeHex("03 0F");//tag
- this.writeShort(hostName.length / 2);//todo check that
- this.writeShort(hostName.length);
+ this.writeHex("01 12")//tag
+ this.writeHex("00 38")//length
+ this.write(token0825)//length
+ this.writeHex("03 0F")//tag
+ this.writeShort(hostName.length / 2)//todo check that
+ this.writeShort(hostName.length)
this.writeBytes(hostName)
this.writeHex("00 05 00 06 00 02")
this.writeQQ(qq)
diff --git a/mirai-core/src/test/java/PacketTest.kt b/mirai-core/src/test/java/PacketTest.kt
index 27757ff9e..156584de1 100644
--- a/mirai-core/src/test/java/PacketTest.kt
+++ b/mirai-core/src/test/java/PacketTest.kt
@@ -1,3 +1,4 @@
+import net.mamoe.mirai.network.packet.client.ClientPasswordSubmissionPacket
import net.mamoe.mirai.network.packet.client.toHexString
import net.mamoe.mirai.network.packet.server.Server0825Packet
import net.mamoe.mirai.util.TEACryptor
@@ -8,6 +9,7 @@ import java.io.DataInputStream
@ExperimentalUnsignedTypes
fun main(){
+ /*
val data = "00 37 13 08 25 31 01 EB 10 08 30 69 50 1C 84 A9 C2 16 D7 52 B9 1C 79 CA 5A CF FD BC EB 10 08 30 69 50 1C 84 A9 C2 16 D7 52 B9 1C 79 CA 5A CF FD BC AE D8 A6 BB DC 21 6E 79 26 E1 A2 23 11 AA B0 9A AE D8 A6 BB DC 21 6E 79 26 E1 A2 23 11 AA B0 9A 76 E4 B8 DD 03 00 00 00 01 2E 01 00 00 68 52 00 00 00 00 A4 F1 91 88 C9 82 14 99 0C 9E 56 55 91 23 C8 3D C3 47 F0 25 A1 8E 74 EF 1E 0B 32 5B 20 8A FA 3B 0B 52 8F 86 E6 04 F1 D6 F8 63 75 60 8C 0C 7D 06 D1 E0 22 F8 49 EF AF 61 EE 7E 69 72 EB 10 08 30 69 50 1C 84 A9 C2 16 D7 52 B9 1C 79 CA 5A CF FD BC AE D8 A6 BB DC 21 6E 79 26 E1 A2 23 11 AA B0 9A 49 39 72 ED 61 12 B6 88 4D A2 56 23 E9 92 11 92 27 4A 70 00 C9 01 7B 03";
val s = DataInputStream(data.hexToBytes().inputStream())
val packet = Server0825Packet(Server0825Packet.Type.TYPE_08_25_31_01,s)
@@ -15,4 +17,7 @@ fun main(){
System.out.println(packet.token.toUByteArray().toHexString(" "))
System.out.println(packet.loginTime.toHexString(" "))
System.out.println(packet.loginIP)
+ */
+
+ // val packet = ClientPasswordSubmissionPacket(1994701021,"xiaoqqq",)
}
\ No newline at end of file
From fa8df3870c3ddfa779cf874855348d4baef8b873 Mon Sep 17 00:00:00 2001
From: liujiahua123123 <liujiahua123123@126.com>
Date: Sat, 17 Aug 2019 23:02:18 +0800
Subject: [PATCH 3/3] remove ; ->
---
.../net/mamoe/mirai/network/packet/server/ServerPacket.kt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
index 28f14998c..3d4dbd6c5 100644
--- a/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
+++ b/mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
@@ -23,8 +23,8 @@ abstract class ServerPacket(val input: DataInputStream) : Packet {
val idBytes = stream.readUntil(11)
return when (idBytes.joinToString("") { it.toString(16) }) {
- "08 25 31 01" -> Server0825Packet(Server0825Packet.Type.TYPE_08_25_31_01, stream)
- "08 25 31 02" -> Server0825Packet(Server0825Packet.Type.TYPE_08_25_31_02, stream)
+ "08 25 31 01" -> ServerTouchResponsePacket(ServerTouchResponsePacket.Type.TYPE_08_25_31_01, stream)
+ "08 25 31 02" -> ServerTouchResponsePacket(ServerTouchResponsePacket.Type.TYPE_08_25_31_02, stream)
else -> throw UnsupportedOperationException()
}