Merge pull request #472 from subutai-io/hotfix

Hotfix
subutai-io · Dec 1, 2017 · de3ecc9 · de3ecc9
2 parents 7584951 + 6349e57
commit de3ecc9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 # Change Log
 
+## [6.2.5] 12/01/2017
+
+* Fixed proxy array population
+* Fixed unnecessary goroutine creation
+
 ## [6.2.4] 11/30/2017
 
 * Refactored communication between peers over TURN server

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.2.4
+6.2.5
diff --git a/lib/p2p.go b/lib/p2p.go
@@ -206,6 +206,7 @@ func (p *PeerToPeer) FindNetworkAddresses() {
 
 // StartP2PInstance is an entry point of a P2P library.
 func New(argIP, argMac, argDev, argDirect, argHash, argDht, argKeyfile, argKey, argTTL, argLog string, fwd bool, port int, ignoreIPs []string, outboundIP net.IP) *PeerToPeer {
+	argDht = "mdht.subut.ai:6881"
 	p := new(PeerToPeer)
 	p.outboundIP = outboundIP
 	p.Init()

diff --git a/lib/proxy.go b/lib/proxy.go
@@ -29,7 +29,7 @@ func (p *PeerToPeer) initProxy(addr string) error {
 		return fmt.Errorf("Failed to resolve proxy address")
 	}
 	for _, pr := range p.Proxies {
-		if pr.Addr == proxy.Addr {
+		if pr.Addr.String() == proxy.Addr.String() {
 			return fmt.Errorf("Proxy %s already exists", addr)
 		}
 	}
@@ -50,6 +50,7 @@ func (p *PeerToPeer) initProxy(addr string) error {
 		p.removeProxy(proxy.Addr)
 		return fmt.Errorf("Wrong proxy status")
 	}
+	Log(Info, "Proxy %s initialization complete", addr)
 	return nil
 }