diff options
| author | obscuren <geffobscura@gmail.com> | 2014-06-18 19:48:52 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-06-18 19:48:52 +0800 |
| commit | 509389be97d65d434e953b52691883aaa8d4c177 (patch) | |
| tree | b35e88445de9b0a1f65899886d9ca070c9f5eda3 /ethereum.go | |
| parent | f911087eab6b31fcdbc22a9a74c0be410e8f0177 (diff) | |
| parent | d179f31d4f0d2a68e97b962e70285d2178857cdf (diff) | |
| download | dexon-509389be97d65d434e953b52691883aaa8d4c177.tar dexon-509389be97d65d434e953b52691883aaa8d4c177.tar.gz dexon-509389be97d65d434e953b52691883aaa8d4c177.tar.bz2 dexon-509389be97d65d434e953b52691883aaa8d4c177.tar.lz dexon-509389be97d65d434e953b52691883aaa8d4c177.tar.xz dexon-509389be97d65d434e953b52691883aaa8d4c177.tar.zst dexon-509389be97d65d434e953b52691883aaa8d4c177.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
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 |