diff options
author | obscuren <geffobscura@gmail.com> | 2014-05-30 19:04:08 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-05-30 19:04:08 +0800 |
commit | f382221b28ab9e886263e37b1eab9c7924a6a0dc (patch) | |
tree | bfe979ce01e02438f6bb9cab8260f8954acc0147 /ethereum.go | |
parent | 6c91ffcfbe1a7b469dc6a8a2676959f0000c925a (diff) | |
download | go-tangerine-f382221b28ab9e886263e37b1eab9c7924a6a0dc.tar.gz go-tangerine-f382221b28ab9e886263e37b1eab9c7924a6a0dc.tar.zst go-tangerine-f382221b28ab9e886263e37b1eab9c7924a6a0dc.zip |
Broadcast "peerList" event upon removing or adding peers
Diffstat (limited to 'ethereum.go')
-rw-r--r-- | ethereum.go | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/ethereum.go b/ethereum.go index 3a7202d53..6be989a10 100644 --- a/ethereum.go +++ b/ethereum.go @@ -165,6 +165,8 @@ func (s *Ethereum) AddPeer(conn net.Conn) { ethutil.Config.Log.Debugf("[SERV] Max connected peers reached. Not adding incoming peer.") } } + + s.reactor.Post("peerList", s.peers) } func (s *Ethereum) ProcessPeerList(addrs []string) { @@ -303,12 +305,26 @@ func (s *Ethereum) Peers() *list.List { } func (s *Ethereum) reapPeers() { + eachPeer(s.peers, func(p *Peer, e *list.Element) { + if atomic.LoadInt32(&p.disconnect) == 1 || (p.inbound && (time.Now().Unix()-p.lastPong) > int64(5*time.Minute)) { + s.removePeerElement(e) + } + }) +} + +func (s *Ethereum) removePeerElement(e *list.Element) { s.peerMut.Lock() defer s.peerMut.Unlock() - eachPeer(s.peers, func(p *Peer, e *list.Element) { - if atomic.LoadInt32(&p.disconnect) == 1 || (p.inbound && (time.Now().Unix()-p.lastPong) > int64(5*time.Minute)) { - s.peers.Remove(e) + s.peers.Remove(e) + + s.reactor.Post("peerList", s.peers) +} + +func (s *Ethereum) RemovePeer(p *Peer) { + eachPeer(s.peers, func(peer *Peer, e *list.Element) { + if peer == p { + s.removePeerElement(e) } }) } |