mirror of
https://github.com/Mezeporta/Erupe.git
synced 2026-03-22 07:32:32 +01:00
fix(channelserver): add fail ACKs to silent error paths to prevent client softlocks
Handlers that log errors and return without sending a MsgSysAck leave the client waiting indefinitely. Add doAckSimpleFail/doAckBufFail to 14 error paths across 4 files, matching the pattern already used in ~70 other error paths across the codebase. Affected handlers: - handleMsgMhfGetCafeDuration (1 path) - handleMsgMhfSavedata (1 path) - handleMsgMhfArrangeGuildMember (3 paths) - handleMsgMhfEnumerateGuildMember (5 paths) - handleMsgSysLogin (4 paths) - handleMsgSysIssueLogkey (1 path)
This commit is contained in:
@@ -77,24 +77,28 @@ func handleMsgSysLogin(s *Session, p mhfpacket.MHFPacket) {
|
||||
_, err := s.server.db.Exec("UPDATE servers SET current_players=$1 WHERE server_id=$2", len(s.server.sessions), s.server.ID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to update current players", zap.Error(err))
|
||||
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
|
||||
return
|
||||
}
|
||||
|
||||
_, err = s.server.db.Exec("UPDATE sign_sessions SET server_id=$1, char_id=$2 WHERE token=$3", s.server.ID, s.charID, s.token)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to update sign session", zap.Error(err))
|
||||
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
|
||||
return
|
||||
}
|
||||
|
||||
_, err = s.server.db.Exec("UPDATE characters SET last_login=$1 WHERE id=$2", TimeAdjusted().Unix(), s.charID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to update last login", zap.Error(err))
|
||||
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
|
||||
return
|
||||
}
|
||||
|
||||
_, err = s.server.db.Exec("UPDATE users u SET last_character=$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)", s.charID)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to update last character", zap.Error(err))
|
||||
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
|
||||
return
|
||||
}
|
||||
|
||||
@@ -366,6 +370,7 @@ func handleMsgSysIssueLogkey(s *Session, p mhfpacket.MHFPacket) {
|
||||
_, err := rand.Read(logKey)
|
||||
if err != nil {
|
||||
s.logger.Error("Failed to generate log key", zap.Error(err))
|
||||
doAckBufFail(s, pkt.AckHandle, make([]byte, 4))
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user