CPunch/gopenfusion
1
0
Fork 0
mirror of https://github.com/CPunch/gopenfusion.git synced 2026-02-09 20:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

loginServer/peer: peer no longer uses panic/recover for error recovery

Browse Source
This commit is contained in:
CPunch
2023-03-10 20:30:16 -06:00
parent 857250bf33
commit d60638d555
3 changed files with 94 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
server/login.go
View File

@@ -23,7 +23,7 @@ const (
LOGIN_UPDATED_EUALA_REQUIRED = 9
)
func (server *LoginServer) AcceptLogin(peer *Peer, SzID string, IClientVerC int32, ISlotNum int8, data []protocol.SP_LS2CL_REP_CHAR_INFO) {
func (server *LoginServer) AcceptLogin(peer *Peer, SzID string, IClientVerC int32, ISlotNum int8, data []protocol.SP_LS2CL_REP_CHAR_INFO) error {
peer.SzID = SzID
resp := &protocol.SP_LS2CL_REP_LOGIN_SUCC{
@@ -35,8 +35,11 @@ func (server *LoginServer) AcceptLogin(peer *Peer, SzID string, IClientVerC int3
UiSvrTime: uint64(time.Now().Unix()),
}
if err := peer.Send(resp, protocol.P_LS2CL_REP_LOGIN_SUCC); err != nil {
return err
}
// swap keys
peer.Send(resp, protocol.P_LS2CL_REP_LOGIN_SUCC)
peer.E_key = protocol.CreateNewKey(
resp.UiSvrTime,
uint64(resp.ICharCount+1),
@@ -50,11 +53,15 @@ func (server *LoginServer) AcceptLogin(peer *Peer, SzID string, IClientVerC int3
// send characters (if any)
for i := 0; i < len(data); i++ {
peer.Send(&data[i], protocol.P_LS2CL_REP_CHAR_INFO)
if err := peer.Send(&data[i], protocol.P_LS2CL_REP_CHAR_INFO); err != nil {
return err
}
}
return nil
}
func (server *LoginServer) Login(peer *Peer, pkt protocol.Packet) {
func (server *LoginServer) Login(peer *Peer, pkt protocol.Packet) error {
var loginPkt protocol.SP_CL2LS_REQ_LOGIN
pkt.Decode(&loginPkt)
@@ -68,7 +75,7 @@ func (server *LoginServer) Login(peer *Peer, pkt protocol.Packet) {
// client is resending a login packet??
if peer.AccountID != -1 {
SendError(LOGIN_ERROR)
panic(fmt.Errorf("Out of order P_CL2LS_REQ_LOGIN!"))
return fmt.Errorf("Out of order P_CL2LS_REQ_LOGIN!")
}
// attempt login
@@ -79,15 +86,15 @@ func (server *LoginServer) Login(peer *Peer, pkt protocol.Packet) {
if err != nil {
// respond with a dummy login error packet so the client doesn't get softlocked
SendError(LOGIN_DATABASE_ERROR)
panic(err)
return err
}
} else if err == db.LoginErrorInvalidPassword {
// respond with invalid password
SendError(LOGIN_ID_AND_PASSWORD_DO_NOT_MATCH)
return
return nil
} else if err != nil { // wtf?
SendError(LOGIN_DATABASE_ERROR)
panic(err)
return err
}
// grab player data
@@ -95,7 +102,7 @@ func (server *LoginServer) Login(peer *Peer, pkt protocol.Packet) {
plrs, err := db.DefaultDB.GetPlayers(account.AccountID)
if err != nil {
SendError(LOGIN_DATABASE_ERROR)
panic(err)
return err
}
// build character list
@@ -115,44 +122,44 @@ func (server *LoginServer) Login(peer *Peer, pkt protocol.Packet) {
AEquip, err := db.DefaultDB.GetPlayerInventorySlots(plr.PlayerID, 0, config.AEQUIP_COUNT-1)
if err != nil {
SendError(LOGIN_DATABASE_ERROR)
panic(err)
return err
}
copy(info.AEquip[:], AEquip)
charInfo = append(charInfo, info)
}
server.AcceptLogin(peer, loginPkt.SzID, loginPkt.IClientVerC, 1, charInfo)
return server.AcceptLogin(peer, loginPkt.SzID, loginPkt.IClientVerC, 1, charInfo)
}
func (server *LoginServer) CheckCharacterName(peer *Peer, pkt protocol.Packet) {
func (server *LoginServer) CheckCharacterName(peer *Peer, pkt protocol.Packet) error {
var charPkt protocol.SP_CL2LS_REQ_CHECK_CHAR_NAME
pkt.Decode(&charPkt)
// just auto accept, client resends this data later
peer.Send(&protocol.SP_LS2CL_REP_CHECK_CHAR_NAME_SUCC{
return peer.Send(&protocol.SP_LS2CL_REP_CHECK_CHAR_NAME_SUCC{
SzFirstName: charPkt.SzFirstName,
SzLastName: charPkt.SzLastName,
}, protocol.P_LS2CL_REP_CHECK_CHAR_NAME_SUCC)
}
func (server *LoginServer) SaveCharacterName(peer *Peer, pkt protocol.Packet) {
func (server *LoginServer) SaveCharacterName(peer *Peer, pkt protocol.Packet) error {
var charPkt protocol.SP_CL2LS_REQ_SAVE_CHAR_NAME
pkt.Decode(&charPkt)
if peer.AccountID == -1 {
peer.Send(&protocol.SP_LS2CL_REP_SAVE_CHAR_NAME_FAIL{}, protocol.P_LS2CL_REP_SAVE_CHAR_NAME_FAIL)
panic(fmt.Errorf("Out of order P_LS2CL_REP_SAVE_CHAR_NAME_FAIL!"))
return fmt.Errorf("Out of order P_LS2CL_REP_SAVE_CHAR_NAME_FAIL!")
}
// TODO: sanity check SzFirstName && SzLastName
PlayerID, err := db.DefaultDB.NewPlayer(peer.AccountID, charPkt.SzFirstName, charPkt.SzLastName, int(charPkt.ISlotNum))
if err != nil {
peer.Send(&protocol.SP_LS2CL_REP_SAVE_CHAR_NAME_FAIL{}, protocol.P_LS2CL_REP_SAVE_CHAR_NAME_FAIL)
panic(err)
return err
}
peer.Send(&protocol.SP_LS2CL_REP_SAVE_CHAR_NAME_SUCC{
return peer.Send(&protocol.SP_LS2CL_REP_SAVE_CHAR_NAME_SUCC{
IPC_UID: int64(PlayerID),
ISlotNum: charPkt.ISlotNum,
IGender: charPkt.IGender,
@@ -187,28 +194,28 @@ func validateCharacterCreation(character *protocol.SP_CL2LS_REQ_CHAR_CREATE) boo
return true
}
func (server *LoginServer) CharacterCreate(peer *Peer, pkt protocol.Packet) {
func (server *LoginServer) CharacterCreate(peer *Peer, pkt protocol.Packet) error {
var charPkt protocol.SP_CL2LS_REQ_CHAR_CREATE
pkt.Decode(&charPkt)
if !validateCharacterCreation(&charPkt) {
peer.Send(&protocol.SP_LS2CL_REP_SHARD_SELECT_FAIL{IErrorCode: 2}, protocol.P_LS2CL_REP_SHARD_SELECT_FAIL)
panic(fmt.Errorf("invalid SP_CL2LS_REQ_CHAR_CREATE!"))
return fmt.Errorf("invalid SP_CL2LS_REQ_CHAR_CREATE!")
}
if err := db.DefaultDB.FinishPlayer(&charPkt, peer.AccountID); err != nil {
peer.Send(&protocol.SP_LS2CL_REP_SHARD_SELECT_FAIL{IErrorCode: 2}, protocol.P_LS2CL_REP_SHARD_SELECT_FAIL)
panic(err)
return err
}
plr, err := db.DefaultDB.GetPlayer(int(charPkt.PCStyle.IPC_UID))
if err != nil {
peer.Send(&protocol.SP_LS2CL_REP_SHARD_SELECT_FAIL{IErrorCode: 2}, protocol.P_LS2CL_REP_SHARD_SELECT_FAIL)
panic(err)
return err
}
PCStyle, PCStyle2 := util.Player2PCStyle(plr)
peer.Send(&protocol.SP_LS2CL_REP_CHAR_CREATE_SUCC{
return peer.Send(&protocol.SP_LS2CL_REP_CHAR_CREATE_SUCC{
ILevel: int16(plr.Level),
SPC_Style: PCStyle,
SPC_Style2: PCStyle2,
@@ -216,29 +223,30 @@ func (server *LoginServer) CharacterCreate(peer *Peer, pkt protocol.Packet) {
}, protocol.P_LS2CL_REP_CHAR_CREATE_SUCC)
}
func (server *LoginServer) CharacterDelete(peer *Peer, pkt protocol.Packet) {
func (server *LoginServer) CharacterDelete(peer *Peer, pkt protocol.Packet) error {
var charPkt protocol.SP_CL2LS_REQ_CHAR_DELETE
pkt.Decode(&charPkt)
slot, err := db.DefaultDB.DeletePlayer(int(charPkt.IPC_UID), peer.AccountID)
if err != nil {
peer.Send(&protocol.SP_LS2CL_REP_SHARD_SELECT_FAIL{IErrorCode: 2}, protocol.P_LS2CL_REP_SHARD_SELECT_FAIL)
panic(err)
return err
}
peer.Send(&protocol.SP_LS2CL_REP_CHAR_DELETE_SUCC{
return peer.Send(&protocol.SP_LS2CL_REP_CHAR_DELETE_SUCC{
ISlotNum: int8(slot),
}, protocol.P_LS2CL_REP_CHAR_DELETE_SUCC)
}
func (server *LoginServer) FinishTutorial(peer *Peer, pkt protocol.Packet) {
func (server *LoginServer) FinishTutorial(peer *Peer, pkt protocol.Packet) error {
var charPkt protocol.SP_CL2LS_REQ_SAVE_CHAR_TUTOR
pkt.Decode(&charPkt)
if err := db.DefaultDB.FinishTutorial(int(charPkt.IPC_UID), peer.AccountID); err != nil {
peer.Send(&protocol.SP_LS2CL_REP_SHARD_SELECT_FAIL{IErrorCode: 2}, protocol.P_LS2CL_REP_SHARD_SELECT_FAIL)
panic(err)
return err
}
// no response
return nil
}