CPunch/gopenfusion
1
0
Fork 0
mirror of https://github.com/CPunch/gopenfusion.git synced 2024-11-14 12:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc. db.GetPlayers() result is now truncated

Browse Source
This commit is contained in:
CPunch 2023-03-11 03:28:11 -06:00
parent c62ed5d101
commit cbe308a0bd
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protocol/pool/pool.go
View File

@ -5,7 +5,7 @@ import (
"sync" "sync"
) )
var allocator = sync.Pool{ var allocator = &sync.Pool{
New: func() any { return new(bytes.Buffer) }, New: func() any { return new(bytes.Buffer) },
} }

14
server/login.go
View File

@ -105,9 +105,14 @@ func (server *LoginServer) Login(peer *Peer, pkt protocol.Packet) error {
return err return err
} }
// truncate plrs
if len(plrs) > 3 {
plrs = plrs[:4]
}
// build character list // build character list
charInfo := make([]protocol.SP_LS2CL_REP_CHAR_INFO, 0, 4) charInfo := [4]protocol.SP_LS2CL_REP_CHAR_INFO{}
for _, plr := range plrs { for i, plr := range plrs {
PCStyle, PCStyle2 := util.Player2PCStyle(&plr) PCStyle, PCStyle2 := util.Player2PCStyle(&plr)
info := protocol.SP_LS2CL_REP_CHAR_INFO{ info := protocol.SP_LS2CL_REP_CHAR_INFO{
ISlot: int8(plr.Slot), ISlot: int8(plr.Slot),
@ -126,10 +131,10 @@ func (server *LoginServer) Login(peer *Peer, pkt protocol.Packet) error {
} }
copy(info.AEquip[:], AEquip) copy(info.AEquip[:], AEquip)
charInfo = append(charInfo, info) charInfo[i] = info
} }
return server.AcceptLogin(peer, loginPkt.SzID, loginPkt.IClientVerC, 1, charInfo) return server.AcceptLogin(peer, loginPkt.SzID, loginPkt.IClientVerC, 1, charInfo[:len(plrs)])
} }
func (server *LoginServer) CheckCharacterName(peer *Peer, pkt protocol.Packet) error { func (server *LoginServer) CheckCharacterName(peer *Peer, pkt protocol.Packet) error {
@ -191,6 +196,7 @@ func validateCharacterCreation(character *protocol.SP_CL2LS_REQ_CHAR_CREATE) boo
return false return false
} }
// TODO: sanity check items in SOn_Item; see db.FinishPlayer()
return true return true
} }

18
server/peer.go
View File

@ -24,15 +24,15 @@ type PeerHandler interface {
} }
type Peer struct { type Peer struct {
Player *db.Player
conn net.Conn
handler PeerHandler
SzID string
E_key []byte E_key []byte
FE_key []byte FE_key []byte
SzID string
AccountID int AccountID int
Player *db.Player
handler PeerHandler
conn net.Conn
alive bool
whichKey int whichKey int
alive bool
} }
func NewPeer(handler PeerHandler, conn net.Conn) *Peer { func NewPeer(handler PeerHandler, conn net.Conn) *Peer {
@ -50,14 +50,15 @@ func NewPeer(handler PeerHandler, conn net.Conn) *Peer {
} }
func (peer *Peer) Send(typeID uint32, data ...interface{}) error { func (peer *Peer) Send(typeID uint32, data ...interface{}) error {
// grab buffer from pool
buf := pool.Get() buf := pool.Get()
defer pool.Put(buf) // always return the buffer to the pool defer pool.Put(buf)
// body start // body start
pkt := protocol.NewPacket(buf) pkt := protocol.NewPacket(buf)
// encode type id // encode type id
if err := pkt.Encode(uint32(typeID)); err != nil { if err := pkt.Encode(typeID); err != nil {
return err return err
} }
@ -117,8 +118,9 @@ func (peer *Peer) Handler() {
return return
} }
// read packet body // grab buffer && read packet body
buf := pool.Get() buf := pool.Get()
defer pool.Put(buf)
if _, err := buf.ReadFrom(io.LimitReader(peer.conn, int64(sz))); err != nil { if _, err := buf.ReadFrom(io.LimitReader(peer.conn, int64(sz))); err != nil {
log.Printf("[FATAL] failed to read packet body! %v", err) log.Printf("[FATAL] failed to read packet body! %v", err)
return return