fix(items): stop G-rank Workshop/Cog softlock on missing ACK

MSG_MHF_GET_EXTRA_INFO (0xA6) and MSG_MHF_GET_COG_INFO (0xC3) had
Parse() returning NOT IMPLEMENTED. The dispatch loop treats any Parse
error as a hard drop — no ACK is ever sent, so the client waits
indefinitely and effectively soft-locks when entering the G-rank
Workshop or Master Felyne (Cog) screens.

Fix: parse AckHandle (the only field we can confirm from the protocol)
and respond with doAckBufFail so the client receives a well-formed
buf-type ACK with error code 1. The client's fail branch for these
requests exits cleanly without reading response fields, avoiding the
read-past-EOF crash that an empty success ACK would cause.

The full response format for both packets is still unknown; a complete
implementation requires further RE. The TODO comments mark the gap.

Fixes #180.
This commit is contained in:
Houmgaor
2026-03-19 14:35:38 +01:00
parent 7ea2660335
commit d27da5ec86
11 changed files with 60 additions and 30 deletions

View File

@@ -1594,7 +1594,6 @@ func TestBatchParseNotImplemented(t *testing.T) {
&MsgSysDispObject{}, &MsgSysHideObject{},
&MsgMhfServerCommand{}, &MsgMhfSetLoginwindow{}, &MsgMhfShutClient{},
&MsgMhfUpdateGuildcard{},
&MsgMhfGetCogInfo{},
&MsgCaExchangeItem{},
}

View File

@@ -495,6 +495,8 @@ func TestAckHandlePacketsParse(t *testing.T) {
{"MsgMhfGetUdSchedule", network.MSG_MHF_GET_UD_SCHEDULE},
{"MsgMhfGetUdInfo", network.MSG_MHF_GET_UD_INFO},
{"MsgMhfGetKijuInfo", network.MSG_MHF_GET_KIJU_INFO},
{"MsgMhfGetExtraInfo", network.MSG_MHF_GET_EXTRA_INFO},
{"MsgMhfGetCogInfo", network.MSG_MHF_GET_COG_INFO},
}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}

View File

@@ -9,7 +9,9 @@ import (
)
// MsgMhfGetCogInfo represents the MSG_MHF_GET_COG_INFO
type MsgMhfGetCogInfo struct{}
type MsgMhfGetCogInfo struct {
AckHandle uint32
}
// Opcode returns the ID associated with this packet type.
func (m *MsgMhfGetCogInfo) Opcode() network.PacketID {
@@ -18,7 +20,8 @@ func (m *MsgMhfGetCogInfo) Opcode() network.PacketID {
// Parse parses the packet from binary
func (m *MsgMhfGetCogInfo) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
return errors.New("NOT IMPLEMENTED")
m.AckHandle = bf.ReadUint32()
return nil
}
// Build builds a binary packet from the current data.

View File

@@ -9,7 +9,9 @@ import (
)
// MsgMhfGetExtraInfo represents the MSG_MHF_GET_EXTRA_INFO
type MsgMhfGetExtraInfo struct{}
type MsgMhfGetExtraInfo struct {
AckHandle uint32
}
// Opcode returns the ID associated with this packet type.
func (m *MsgMhfGetExtraInfo) Opcode() network.PacketID {
@@ -18,7 +20,8 @@ func (m *MsgMhfGetExtraInfo) Opcode() network.PacketID {
// Parse parses the packet from binary
func (m *MsgMhfGetExtraInfo) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
return errors.New("NOT IMPLEMENTED")
m.AckHandle = bf.ReadUint32()
return nil
}
// Build builds a binary packet from the current data.

View File

@@ -25,7 +25,6 @@ func TestParseSmallNotImplemented(t *testing.T) {
{"MsgMhfGetCaUniqueID", &MsgMhfGetCaUniqueID{}},
{"MsgMhfGetDailyMissionMaster", &MsgMhfGetDailyMissionMaster{}},
{"MsgMhfGetDailyMissionPersonal", &MsgMhfGetDailyMissionPersonal{}},
{"MsgMhfGetExtraInfo", &MsgMhfGetExtraInfo{}},
{"MsgMhfGetRestrictionEvent", &MsgMhfGetRestrictionEvent{}},
{"MsgMhfKickExportForce", &MsgMhfKickExportForce{}},
{"MsgMhfPaymentAchievement", &MsgMhfPaymentAchievement{}},
@@ -196,6 +195,38 @@ func TestParseSmallEnumerateHouse(t *testing.T) {
})
}
// TestParseSmallGetExtraInfoAndCogInfo tests that MsgMhfGetExtraInfo and
// MsgMhfGetCogInfo correctly parse their AckHandle field.
func TestParseSmallGetExtraInfoAndCogInfo(t *testing.T) {
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}
t.Run("GetExtraInfo", func(t *testing.T) {
bf := byteframe.NewByteFrame()
bf.WriteUint32(0xDEADBEEF)
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetExtraInfo{}
if err := pkt.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err)
}
if pkt.AckHandle != 0xDEADBEEF {
t.Errorf("AckHandle = 0x%X, want 0xDEADBEEF", pkt.AckHandle)
}
})
t.Run("GetCogInfo", func(t *testing.T) {
bf := byteframe.NewByteFrame()
bf.WriteUint32(0xCAFEBABE)
_, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetCogInfo{}
if err := pkt.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err)
}
if pkt.AckHandle != 0xCAFEBABE {
t.Errorf("AckHandle = 0x%X, want 0xCAFEBABE", pkt.AckHandle)
}
})
}
// TestParseSmallNotImplementedDoesNotPanic ensures that calling Parse on NOT IMPLEMENTED
// packets returns an error and does not panic.
func TestParseSmallNotImplementedDoesNotPanic(t *testing.T) {