From dcf4fad97156f431612ed3915e167ce5a5314588 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 24 Jul 2014 12:30:04 +0200
Subject: Networking code

---
 peer.go | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'peer.go')

diff --git a/peer.go b/peer.go
index ac4ba82ab..c73617ed5 100644
--- a/peer.go
+++ b/peer.go
@@ -177,18 +177,7 @@ func NewOutboundPeer(addr string, ethereum *Ethereum, caps Caps) *Peer {
 
 	// Set up the connection in another goroutine so we don't block the main thread
 	go func() {
-		var (
-			err  error
-			conn net.Conn
-		)
-
-		for attempts := 0; attempts < 5; attempts++ {
-			conn, err = net.DialTimeout("tcp", addr, 10*time.Second)
-			if err != nil {
-				peerlogger.Debugf("Peer connection failed. Retrying (%d/5)\n", attempts+1)
-			}
-		}
-
+		conn, err := p.Connect(addr)
 		if err != nil {
 			peerlogger.Debugln("Connection to peer failed. Giving up.", err)
 			p.Stop()
@@ -206,6 +195,21 @@ func NewOutboundPeer(addr string, ethereum *Ethereum, caps Caps) *Peer {
 	return p
 }
 
+func (self *Peer) Connect(addr string) (conn net.Conn, err error) {
+	for attempts := 0; attempts < 5; attempts++ {
+		conn, err = net.DialTimeout("tcp", addr, 10*time.Second)
+		if err != nil {
+			peerlogger.Debugf("Peer connection failed. Retrying (%d/5)\n", attempts+1)
+			continue
+		}
+
+		// Success
+		return
+	}
+
+	return
+}
+
 // Getters
 func (p *Peer) PingTime() string {
 	return p.pingTime.String()
-- 
cgit