status-im
/
go-libp2p
mirror of https://github.com/status-im/go-libp2p.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up messy defer logic in IDService.sendIdentifyResp

This commit is contained in:
Marten Seemann 2021-08-24 15:00:34 +01:00
parent 0741d17496
commit a507d12bd4
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
p2p/protocol/identify/id.go
View File

@ -381,14 +381,7 @@ func (ids *IDService) identifyConn(c network.Conn, signal chan struct{}) {
}
func (ids *IDService) sendIdentifyResp(s network.Stream) {
var ph *peerHandler
defer func() {
_ = s.Close()
if ph != nil {
ph.snapshotMu.RUnlock()
}
}()
defer s.Close()
c := s.Conn()
@ -399,6 +392,7 @@ func (ids *IDService) sendIdentifyResp(s network.Stream) {
return
}
var ph *peerHandler
select {
case ph = <-phCh:
case <-ids.ctx.Done():
@ -412,7 +406,9 @@ func (ids *IDService) sendIdentifyResp(s network.Stream) {
}
ph.snapshotMu.RLock()
ids.writeChunkedIdentifyMsg(c, ph.snapshot, s)
snapshot := ph.snapshot
ph.snapshotMu.RUnlock()
ids.writeChunkedIdentifyMsg(c, snapshot, s)
log.Debugf("%s sent message to %s %s", ID, c.RemotePeer(), c.RemoteMultiaddr())
}