poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Connect to previous peer

This commit is contained in:
obscuren 2014-09-16 16:36:27 +02:00
parent 66e309c5c4
commit 1549a29c9d
2 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ethereum.go
View File

@ -2,9 +2,11 @@ package eth
import ( import (
"container/list" "container/list"
"encoding/json"
"fmt" "fmt"
"math/rand" "math/rand"
"net" "net"
"path"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
@ -31,9 +33,7 @@ var ethlogger = ethlog.NewLogger("SERV")
func eachPeer(peers *list.List, callback func(*Peer, *list.Element)) { func eachPeer(peers *list.List, callback func(*Peer, *list.Element)) {
// Loop thru the peers and close them (if we had them) // Loop thru the peers and close them (if we had them)
for e := peers.Front(); e != nil; e = e.Next() { for e := peers.Front(); e != nil; e = e.Next() {
if peer, ok := e.Value.(*Peer); ok { callback(e.Value.(*Peer), e)
callback(peer, e)
}
} }
} }
@ -399,6 +399,15 @@ func (s *Ethereum) Start(seed bool) {
} }
func (s *Ethereum) Seed() { func (s *Ethereum) Seed() {
var ips []string
data, _ := ethutil.ReadAllFile(path.Join(ethutil.Config.ExecPath, "known_peers.json"))
json.Unmarshal([]byte(data), &ips)
if len(ips) > 0 {
for _, ip := range ips {
ethlogger.Infoln("Connecting to previous peer ", ip)
s.ConnectToPeer(ip)
}
} else {
ethlogger.Debugln("Retrieving seed nodes") ethlogger.Debugln("Retrieving seed nodes")
// Eth-Go Bootstrapping // Eth-Go Bootstrapping
@ -441,6 +450,7 @@ func (s *Ethereum) Seed() {
// XXX tmp // XXX tmp
s.ConnectToPeer(seedNodeAddress) s.ConnectToPeer(seedNodeAddress)
} }
}
func (s *Ethereum) peerHandler(listener net.Listener) { func (s *Ethereum) peerHandler(listener net.Listener) {
for { for {
@ -459,6 +469,13 @@ func (s *Ethereum) Stop() {
// Close the database // Close the database
defer s.db.Close() defer s.db.Close()
var ips []string
eachPeer(s.peers, func(p *Peer, e *list.Element) {
ips = append(ips, p.conn.RemoteAddr().String())
})
d, _ := json.MarshalIndent(ips, "", " ")
ethutil.WriteFile(path.Join(ethutil.Config.ExecPath, "known_peers.json"), d)
eachPeer(s.peers, func(p *Peer, e *list.Element) { eachPeer(s.peers, func(p *Peer, e *list.Element) {
p.Stop() p.Stop()
}) })

10
peer.go
View File

@ -680,7 +680,7 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
var ( var (
p2pVersion = c.Get(0).Uint() p2pVersion = c.Get(0).Uint()
clientId = c.Get(1).Str() clientId = c.Get(1).Str()
caps = c.Get(2).Raw() caps = c.Get(2)
port = c.Get(3).Uint() port = c.Get(3).Uint()
pub = c.Get(4).Bytes() pub = c.Get(4).Bytes()
) )
@ -734,12 +734,18 @@ func (p *Peer) handleHandshake(msg *ethwire.Msg) {
p.ethereum.PushPeer(p) p.ethereum.PushPeer(p)
p.ethereum.reactor.Post("peerList", p.ethereum.Peers()) p.ethereum.reactor.Post("peerList", p.ethereum.Peers())
ethlogger.Infof("Added peer (%s) %d / %d (%v)\n", p.conn.RemoteAddr(), p.ethereum.Peers().Len(), p.ethereum.MaxPeers, caps) ethlogger.Infof("Added peer (%s) %d / %d (%v)\n", p.conn.RemoteAddr(), p.ethereum.Peers().Len(), p.ethereum.MaxPeers, caps.Raw())
peerlogger.Debugln(p) peerlogger.Debugln(p)
capsIt := caps.NewIterator()
for capsIt.Next() {
switch capsIt.Value().Str() {
case "eth":
p.pushStatus() p.pushStatus()
} }
}
}
func (p *Peer) String() string { func (p *Peer) String() string {
var strBoundType string var strBoundType string