Merge branch 'develop' of https://github.com/jarradh/eth-go into jarradh-develop

This commit is contained in:
obscuren 2014-03-07 11:26:46 +01:00
commit 54bcee512d
1 changed files with 38 additions and 13 deletions

View File

@ -263,8 +263,32 @@ func (s *Ethereum) Start() {
if ethutil.Config.Seed { if ethutil.Config.Seed {
ethutil.Config.Log.Debugln("Seeding") ethutil.Config.Log.Debugln("Seeding")
// Testnet seed bootstrapping // DNS Bootstrapping
resp, err := http.Get("https://www.ethereum.org/servers.poc3.txt") _, nodes, err := net.LookupSRV("eth", "tcp", "ethereum.org")
if err == nil {
peers := []string{}
// Iterate SRV nodes
for _, n := range nodes {
target := n.Target
port := strconv.Itoa(int(n.Port))
// Resolve target to ip (Go returns list, so may resolve to multiple ips?)
addr, err := net.LookupHost(target)
if err == nil {
for _, a := range addr {
// Build string out of SRV port and Resolved IP
peer := net.JoinHostPort(a, port)
log.Println("Found DNS Bootstrap Peer:", peer)
peers = append(peers, peer)
}
} else {
log.Println("Couldn't resolve :", target)
}
}
// Connect to Peer list
s.ProcessPeerList(peers)
} else {
// Fallback to servers.poc3.txt
resp, err := http.Get("http://www.ethereum.org/servers.poc3.txt")
if err != nil { if err != nil {
log.Println("Fetching seed failed:", err) log.Println("Fetching seed failed:", err)
return return
@ -278,6 +302,7 @@ func (s *Ethereum) Start() {
s.ConnectToPeer(string(body)) s.ConnectToPeer(string(body))
} }
}
} }
func (s *Ethereum) peerHandler(listener net.Listener) { func (s *Ethereum) peerHandler(listener net.Listener) {