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

p2p: revert rlpx attempt at discovery deadlock fix

Browse source
This commit is contained in:
Anton Evangelatov 2018-02-14 19:05:32 +01:00
parent 3bb97043fa
commit da310f9ad1
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
p2p/rlpx.go
View file

@ -108,9 +108,8 @@ 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 {
if err2 := t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout)); err2 != nil { t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout))
SendItems(t.rw, discMsg, r) SendItems(t.rw, discMsg, r)
}
} }
} }
t.fd.Close() t.fd.Close()