From f4a96ca588a4c7e1382e9c2265ca306a5b0d0adf Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sun, 2 Feb 2014 19:46:37 +0100
Subject: [PATCH] Removed the seed peer option from start
---
ethereum.go | 2 +-
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()
}
}
diff --git a/peer.go b/peer.go
index a715e205d..e9a8f6c03 100644
--- a/peer.go
+++ b/peer.go
@@ -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 {
--
GitLab