Skip to content

G
Geth-Modification
Commit aa3b91b8 authored by Felix Lange's avatar Felix Lange
Browse files
Options

p2p: fix call to Server.removePeer (might help with #209)

parent b55fabc7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
p2p/server.go
View file @ aa3b91b8
...@@ -246,12 +246,7 @@ func (srv *Server) Stop() { ...@@ -246,12 +246,7 @@ func (srv *Server) Stop() {
func (srv *Server) discLoop() { func (srv *Server) discLoop() {
for peer := range srv.peerDisconnect { for peer := range srv.peerDisconnect {
// peer has just disconnected. free up its slot. srv.removePeer(peer)
srvlog.Infof("%v is gone", peer)
srv.peerSlots <- peer.slot
srv.lock.Lock()
srv.peers[peer.slot] = nil
srv.lock.Unlock()
} }
} }
...@@ -384,7 +379,7 @@ func (srv *Server) addPeer(conn net.Conn, desc *peerAddr, slot int) *Peer { ...@@ -384,7 +379,7 @@ func (srv *Server) addPeer(conn net.Conn, desc *peerAddr, slot int) *Peer {
func (srv *Server) removePeer(peer *Peer) { func (srv *Server) removePeer(peer *Peer) {
srv.lock.Lock() srv.lock.Lock()
defer srv.lock.Unlock() defer srv.lock.Unlock()
srvlog.Debugf("Removing peer %v %v (slot %v)\n", peer, peer.slot) srvlog.Debugf("Removing %v (slot %v)\n", peer, peer.slot)
if srv.peers[peer.slot] != peer { if srv.peers[peer.slot] != peer {
srvlog.Warnln("Invalid peer to remove:", peer) srvlog.Warnln("Invalid peer to remove:", peer)
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment