diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-20 06:47:52 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-20 06:47:52 +0800 |
| commit | 3f1f8438ed8bf7b63ea5172090a5c7025cb093f0 (patch) | |
| tree | 6ef2ddd9ff6bff930e48368e7ccb442de9ca7f9e /ethereum.go | |
| parent | 5a0e75173626704c3d58be582dff318218569ef3 (diff) | |
| parent | 7ad073fb30e92689942d938939223bd01cb5fe38 (diff) | |
| download | dexon-3f1f8438ed8bf7b63ea5172090a5c7025cb093f0.tar dexon-3f1f8438ed8bf7b63ea5172090a5c7025cb093f0.tar.gz dexon-3f1f8438ed8bf7b63ea5172090a5c7025cb093f0.tar.bz2 dexon-3f1f8438ed8bf7b63ea5172090a5c7025cb093f0.tar.lz dexon-3f1f8438ed8bf7b63ea5172090a5c7025cb093f0.tar.xz dexon-3f1f8438ed8bf7b63ea5172090a5c7025cb093f0.tar.zst dexon-3f1f8438ed8bf7b63ea5172090a5c7025cb093f0.zip | |
Merge branch 'release/0.5.14'
Diffstat (limited to 'ethereum.go')
| -rw-r--r-- | ethereum.go | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/ethereum.go b/ethereum.go index d9281cd57..a6cb78b1f 100644 --- a/ethereum.go +++ b/ethereum.go @@ -149,7 +149,9 @@ func (s *Ethereum) IsUpToDate() bool { }) return upToDate } - +func (s *Ethereum) PushPeer(peer *Peer) { + s.peers.PushBack(peer) +} func (s *Ethereum) IsListening() bool { return s.listening } @@ -159,14 +161,11 @@ func (s *Ethereum) AddPeer(conn net.Conn) { if peer != nil { if s.peers.Len() < s.MaxPeers { - s.peers.PushBack(peer) peer.Start() } else { 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) { @@ -233,12 +232,7 @@ func (s *Ethereum) ConnectToPeer(addr string) error { return nil } - peer := NewOutboundPeer(addr, s, s.serverCaps) - - s.peers.PushBack(peer) - - ethutil.Config.Log.Infof("[SERV] Adding peer (%s) %d / %d\n", addr, s.peers.Len(), s.MaxPeers) - s.reactor.Post("peerList", s.peers) + NewOutboundPeer(addr, s, s.serverCaps) } return nil |