diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-02 17:30:27 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-02 17:30:27 +0800 |
| commit | 0fb1bcd32192b8bf05a328b955a08da4cefe0180 (patch) | |
| tree | 67460b927eb41b2876e8e6b7eb9dece494dbd088 /p2p | |
| parent | 8da07e91e40c1d1bb43763b7e959ae92e5770af2 (diff) | |
| parent | a4dc12f12c7a06f5e28d5b1e760249875ef7a8c5 (diff) | |
| download | dexon-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar dexon-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.gz dexon-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.bz2 dexon-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.lz dexon-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.xz dexon-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.zst dexon-0fb1bcd32192b8bf05a328b955a08da4cefe0180.zip | |
Merge branch 'poc8' into docbranch
Diffstat (limited to 'p2p')
| -rw-r--r-- | p2p/server.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/p2p/server.go b/p2p/server.go index 8a6087566..326781234 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -246,12 +246,7 @@ func (srv *Server) Stop() { func (srv *Server) discLoop() { for peer := range srv.peerDisconnect { - // peer has just disconnected. free up its slot. - srvlog.Infof("%v is gone", peer) - srv.peerSlots <- peer.slot - srv.lock.Lock() - srv.peers[peer.slot] = nil - srv.lock.Unlock() + srv.removePeer(peer) } } @@ -384,7 +379,7 @@ func (srv *Server) addPeer(conn net.Conn, desc *peerAddr, slot int) *Peer { func (srv *Server) removePeer(peer *Peer) { srv.lock.Lock() 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 { srvlog.Warnln("Invalid peer to remove:", peer) return @@ -416,6 +411,7 @@ func (srv *Server) verifyPeer(addr *peerAddr) error { return nil } +// TODO replace with "Set" type Blacklist interface { Get([]byte) (bool, error) Put([]byte) error |