Removed the seed peer option from start

pull/150/head
obscuren 11 years ago
parent 48b41862ef
commit f4a96ca588
  1. 2
      ethereum.go
  2. 17
      peer.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 {

Loading…
Cancel
Save