Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-22 15:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(stage): fix deadlock that was preventing stage change.

Browse Source
This commit is contained in:
Houmgaor
2025-10-27 01:11:57 +01:00
parent 7e9440d8cc
commit 488e8fa045
4 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/channelserver/sys_session.go
View File

@@ -147,7 +147,10 @@ func (s *Session) Start() {
//
// Thread Safety: Safe for concurrent calls from multiple goroutines.
func (s *Session) QueueSend(data []byte) {
s.logMessage(binary.BigEndian.Uint16(data[0:2]), data, "Server", s.Name)
// FIX: Check data length before reading opcode to prevent crash on empty packets
if len(data) >= 2 {
s.logMessage(binary.BigEndian.Uint16(data[0:2]), data, "Server", s.Name)
}
select {
case s.sendPackets <- packet{data, false}:
// Enqueued data
@@ -182,7 +185,9 @@ func (s *Session) QueueSend(data []byte) {
func (s *Session) QueueSendNonBlocking(data []byte) {
select {
case s.sendPackets <- packet{data, true}:
s.logMessage(binary.BigEndian.Uint16(data[0:2]), data, "Server", s.Name)
if len(data) >= 2 {
s.logMessage(binary.BigEndian.Uint16(data[0:2]), data, "Server", s.Name)
}
default:
s.logger.Warn("Packet queue too full, dropping!")
}
@@ -231,10 +236,13 @@ func (s *Session) sendLoop() {
if s.closed {
return
}
pkt := <-s.sendPackets
err := s.cryptConn.SendPacket(append(pkt.data, []byte{0x00, 0x10}...))
if err != nil {
s.logger.Warn("Failed to send packet")
// Send each packet individually with its own terminator
for len(s.sendPackets) > 0 {
pkt := <-s.sendPackets
err := s.cryptConn.SendPacket(append(pkt.data, []byte{0x00, 0x10}...))
if err != nil {
s.logger.Warn("Failed to send packet", zap.Error(err))
}
}
time.Sleep(10 * time.Millisecond)
}