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

server/peer: wrap 'defer pool.Put()' in a closure

Browse Source
This commit is contained in:
CPunch 2023-03-11 15:02:01 -06:00
parent cbe308a0bd
commit 7a26ffdcf7
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
server/peer.go
View File

@ -119,32 +119,33 @@ func (peer *Peer) Handler() {
} }
// grab buffer && read packet body // grab buffer && read packet body
buf := pool.Get() if err := func() error { // we wrap this in a closure so we can easily defer the buffer return to pool
defer pool.Put(buf) buf := pool.Get()
if _, err := buf.ReadFrom(io.LimitReader(peer.conn, int64(sz))); err != nil { defer pool.Put(buf)
log.Printf("[FATAL] failed to read packet body! %v", err) if _, err := buf.ReadFrom(io.LimitReader(peer.conn, int64(sz))); err != nil {
return return fmt.Errorf("failed to read packet body! %v", err)
} }
// decrypt // decrypt
protocol.DecryptData(buf.Bytes(), peer.E_key) protocol.DecryptData(buf.Bytes(), peer.E_key)
pkt := protocol.NewPacket(buf) pkt := protocol.NewPacket(buf)
// create packet && read typeID // create packet && read typeID
var typeID uint32 var typeID uint32
if err := pkt.Decode(&typeID); err != nil { if err := pkt.Decode(&typeID); err != nil {
log.Printf("[FATAL] failed to read packet type! %v", err) return fmt.Errorf("failed to read packet type! %v", err)
return }
}
// dispatch packet // dispatch packet
log.Printf("Got packet ID: %x, with a sizeof: %d\n", typeID, sz) log.Printf("Got packet ID: %x, with a sizeof: %d\n", typeID, sz)
if err := peer.handler.HandlePacket(peer, typeID, pkt); err != nil { if err := peer.handler.HandlePacket(peer, typeID, pkt); err != nil {
return err
}
return nil
}(); err != nil {
log.Printf("[FATAL] %v", err) log.Printf("[FATAL] %v", err)
return return
} }
// restore buffer to pool
pool.Put(buf)
} }
} }