diff options
| author | obscuren <geffobscura@gmail.com> | 2014-02-03 02:46:37 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-02-03 02:46:37 +0800 |
| commit | f4a96ca588a4c7e1382e9c2265ca306a5b0d0adf (patch) | |
| tree | bdc84be2083eee99b3f646ffa8bc0c22b39f0127 | |
| parent | 48b41862ef89e3d694b71d452e7f67bfb34ca17f (diff) | |
| download | go-tangerine-f4a96ca588a4c7e1382e9c2265ca306a5b0d0adf.tar.gz go-tangerine-f4a96ca588a4c7e1382e9c2265ca306a5b0d0adf.tar.zst go-tangerine-f4a96ca588a4c7e1382e9c2265ca306a5b0d0adf.zip | |
Removed the seed peer option from start
| -rw-r--r-- | ethereum.go | 2 | ||||
| -rw-r--r-- | peer.go | 17 |
2 files changed, 3 insertions, 16 deletions
diff --git a/ethereum.go b/ethereum.go index b178644cf..fa7ce9ec7 100644 --- a/ethereum.go +++ b/ethereum.go @@ -96,7 +96,7 @@ func (s *Ethereum) AddPeer(conn net.Conn) { if peer != nil { s.peers.PushBack(peer) - peer.Start(false) + peer.Start() } } @@ -76,9 +76,6 @@ type Peer struct { // this to prevent receiving false peers. requestedPeerList bool - // Determines whether this is a seed peer - seed bool - host []byte port uint16 caps Caps @@ -123,7 +120,7 @@ func NewOutboundPeer(addr string, ethereum *Ethereum, caps Caps) *Peer { atomic.StoreInt32(&p.connected, 1) atomic.StoreInt32(&p.disconnect, 0) - p.Start(false) + p.Start() }() return p @@ -155,14 +152,6 @@ func (p *Peer) writeMessage(msg *ethwire.Msg) { p.Stop() return } - - // XXX TMP CODE FOR TESTNET - switch msg.Type { - case ethwire.MsgPeersTy: - if p.seed { - p.Stop() - } - } } // Outbound message handler. Outbound messages are handled here @@ -349,9 +338,7 @@ func unpackAddr(value *ethutil.RlpValue, p uint64) string { return net.JoinHostPort(host, port) } -func (p *Peer) Start(seed bool) { - p.seed = seed - +func (p *Peer) Start() { peerHost, peerPort, _ := net.SplitHostPort(p.conn.LocalAddr().String()) servHost, servPort, _ := net.SplitHostPort(p.conn.RemoteAddr().String()) if peerHost == servHost { |