From 9bd97383bdddd43a189b0d136de56cf0ff8633eb Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Wed, 23 Mar 2016 16:04:42 -0400
Subject: [PATCH] don't connect to ipv6 address if not supported

---
 Transports.cpp | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/Transports.cpp b/Transports.cpp
index c5d6c3cb..2127b646 100644
--- a/Transports.cpp
+++ b/Transports.cpp
@@ -378,13 +378,18 @@ namespace transport
 			{
 				auto address = (*it).endpoint ().address ();
 				LogPrint (eLogDebug, "Transports: ", (*it).host_name (), " has been resolved to ", address);
-				auto addr = peer.router->GetNTCPAddress ();
-				if (addr)
+				if (address.is_v4 () || context.SupportsV6 ())
 				{
-					auto s = std::make_shared<NTCPSession> (*m_NTCPServer, peer.router);
-					m_NTCPServer->Connect (address, addr->port, s);
-					return;
+					auto addr = peer.router->GetNTCPAddress (); // TODO: take one we requested
+					if (addr)
+					{
+						auto s = std::make_shared<NTCPSession> (*m_NTCPServer, peer.router);
+						m_NTCPServer->Connect (address, addr->port, s);
+						return;
+					}
 				}	
+				else
+					LogPrint (eLogInfo, "Can't connect to NTCP ", address, " ipv6 is not supported");
 			}
 			LogPrint (eLogError, "Transports: Unable to resolve NTCP address: ", ecode.message ());
 			std::unique_lock<std::mutex>  l(m_PeersMutex);		
@@ -411,12 +416,17 @@ namespace transport
 			{
 				auto address = (*it).endpoint ().address ();
 				LogPrint (eLogDebug, "Transports: ", (*it).host_name (), " has been resolved to ", address);
-				auto addr = peer.router->GetSSUAddress (!context.SupportsV6 ());;
-				if (addr)
+				if (address.is_v4 () || context.SupportsV6 ())
 				{
-					m_SSUServer->CreateSession (peer.router, address, addr->port);
-					return;
+					auto addr = peer.router->GetSSUAddress (); // TODO: take one we requested
+					if (addr)
+					{
+						m_SSUServer->CreateSession (peer.router, address, addr->port);
+						return;
+					}
 				}	
+				else
+					LogPrint (eLogInfo, "Can't connect to SSU ", address, " ipv6 is not supported");
 			}
 			LogPrint (eLogError, "Transports: Unable to resolve SSU address: ", ecode.message ());
 			std::unique_lock<std::mutex>  l(m_PeersMutex);