From 8ea7e21f64842380833cce7aafa52b909cb8426b Mon Sep 17 00:00:00 2001
From: Maran <maran.hidskes@gmail.com>
Date: Mon, 17 Mar 2014 10:37:37 +0100
Subject: Merge

---
 ethereum.go | 51 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 13 deletions(-)

(limited to 'ethereum.go')

diff --git a/ethereum.go b/ethereum.go
index 302f3c04f..c906a6954 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -271,20 +271,45 @@ func (s *Ethereum) Start() {
 
 	if ethutil.Config.Seed {
 		ethutil.Config.Log.Debugln("Seeding")
-		// Testnet seed bootstrapping
-		resp, err := http.Get("https://www.ethereum.org/servers.poc3.txt")
-		if err != nil {
-			log.Println("Fetching seed failed:", err)
-			return
-		}
-		defer resp.Body.Close()
-		body, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			log.Println("Reading seed failed:", err)
-			return
-		}
+		// DNS Bootstrapping
+		_, 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 {
+				log.Println("Fetching seed failed:", err)
+				return
+			}
+			defer resp.Body.Close()
+			body, err := ioutil.ReadAll(resp.Body)
+			if err != nil {
+				log.Println("Reading seed failed:", err)
+				return
+			}
 
-		s.ConnectToPeer(string(body))
+			s.ConnectToPeer(string(body))
+		}
 	}
 }
 
-- 
cgit