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

Fix extradata not passed for simple packet

Browse Source
This commit is contained in:
sandtechnology 2023-06-29 13:59:11 +08:00 committed by Karlatemp
parent 8af6c3fcf6
commit 787ee833cc
No known key found for this signature in database
GPG Key ID: BA173CA2B9956C59
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mirai-core/src/commonMain/kotlin/network/protocol/packet/OutgoingPacket.kt
View File

@ -169,11 +169,16 @@ internal fun <R : Packet?> buildRawUniPacket(
if (signDataPacket != BRP_STUB && (extraData != BRP_STUB && extraData.remaining != 0L)) { if (signDataPacket != BRP_STUB && (extraData != BRP_STUB && extraData.remaining != 0L)) {
throw IllegalStateException("$commandName cmd needs sign but has extraData!") throw IllegalStateException("$commandName cmd needs sign but has extraData!")
} }
if (encryptMethod === PacketEncryptType.NoEncrypt) { if (encryptMethod === PacketEncryptType.NoEncrypt) {
writeUniPacket( writeUniPacket(
commandName, commandName,
client.outgoingPacketSessionId, client.outgoingPacketSessionId,
signDataPacket, if (signDataPacket == BRP_STUB) {
extraData
} else {
signDataPacket
},
(client.qimei16?.encodeToByteArray() ?: EMPTY_BYTE_ARRAY) (client.qimei16?.encodeToByteArray() ?: EMPTY_BYTE_ARRAY)
) { ) {
writeFully(bodyBytes) writeFully(bodyBytes)
@ -183,7 +188,11 @@ internal fun <R : Packet?> buildRawUniPacket(
writeUniPacket( writeUniPacket(
commandName, commandName,
client.outgoingPacketSessionId, client.outgoingPacketSessionId,
signDataPacket, if (signDataPacket == BRP_STUB) {
extraData
} else {
signDataPacket
},
(client.qimei16?.encodeToByteArray() ?: EMPTY_BYTE_ARRAY) (client.qimei16?.encodeToByteArray() ?: EMPTY_BYTE_ARRAY)
) { ) {
writeFully(bodyBytes) writeFully(bodyBytes)