forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p: add error check to SetWriteDeadline call in rlpx

Browse source 
rlpx tries to send discreason to disconnected peer
 if the connection is net.Pipe (in-memory simulation)
 it hangs forever, since net.Pipe does not implement
 a write deadline. This commit adds error checking
 on the SetWriteDeadline call and only tries to send
 the disconnect reason message if there is no error
This commit is contained in:
zelig 2017-09-18 13:44:14 +02:00 committed by Anton Evangelatov
parent 6ffc6c6ef7
commit aaaf75d26e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
p2p/rlpx.go
View file

@ -108,8 +108,9 @@ func (t *rlpx) close(err error) {
// Tell the remote end why we're disconnecting if possible. // Tell the remote end why we're disconnecting if possible.
if t.rw != nil { if t.rw != nil {
if r, ok := err.(DiscReason); ok && r != DiscNetworkError { if r, ok := err.(DiscReason); ok && r != DiscNetworkError {
t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout)) if err = t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout)); err == nil {
SendItems(t.rw, discMsg, r) SendItems(t.rw, discMsg, r)
}
} }
} }
t.fd.Close() t.fd.Close()