Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-12 23:14:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
wish
2023-08-30 21:08:40 +10:00
parent e6f1298935
commit 81e8d21d4b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
network/mhfpacket/msg_sys_operate_register.go
View File

@@ -25,8 +25,7 @@ func (m *MsgSysOperateRegister) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Cl
m.SemaphoreID = bf.ReadUint32()
_ = bf.ReadUint16()
dataSize := bf.ReadUint16()
m.RawDataPayload = bf.ReadBytes(uint(dataSize) - 1)
_ = bf.ReadBytes(1) // Null terminator
m.RawDataPayload = bf.ReadBytes(uint(dataSize))
return nil
}

5
server/channelserver/handlers_register.go
View File

@@ -3,7 +3,6 @@ package channelserver
import (
"erupe-ce/common/byteframe"
"erupe-ce/network/mhfpacket"
"go.uber.org/zap"
"strings"
)
@@ -18,12 +17,12 @@ func handleMsgSysOperateRegister(s *Session, p mhfpacket.MHFPacket) {
var raviUpdates []RaviUpdate
var raviUpdate RaviUpdate
bf := byteframe.NewByteFrameFromBytes(pkt.RawDataPayload)
// Strip null terminator
bf := byteframe.NewByteFrameFromBytes(pkt.RawDataPayload[:len(pkt.RawDataPayload)-1])
for i := len(pkt.RawDataPayload) / 6; i > 0; i-- {
raviUpdate.Op = bf.ReadUint8()
raviUpdate.Dest = bf.ReadUint8()
raviUpdate.Data = bf.ReadUint32()
s.logger.Debug("RaviOps", zap.Uint8s("Op/Dest", []uint8{raviUpdate.Op, raviUpdate.Dest}), zap.Uint32s("Sema/Data", []uint32{pkt.SemaphoreID, raviUpdate.Data}))
raviUpdates = append(raviUpdates, raviUpdate)
}
bf = byteframe.NewByteFrame()