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

p2p: fix possible Server.Stop deadlock

Browse source
This commit is contained in:
Janos Guljas 2018-07-27 12:53:10 +02:00
parent 7abedf9bbb
commit b5e5d504de
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
p2p/server.go
View file

@ -340,8 +340,8 @@ func (srv *Server) makeSelf(listener net.Listener, ntab discoverTable) *discover
// It blocks until all active connections have been closed.
func (srv *Server) Stop() {
srv.lock.Lock()
defer srv.lock.Unlock()
if !srv.running {
srv.lock.Unlock()
return
}
srv.running = false
@ -350,6 +350,7 @@ func (srv *Server) Stop() {
srv.listener.Close()
}
close(srv.quit)
srv.lock.Unlock()
srv.loopWG.Wait()
}