From 2e0019c8c8c7f524710c9abf581e8794eaac267a Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sun, 24 Jan 2021 11:34:11 -0500
Subject: [PATCH] check if NTCP2 address is valid before connection attempt

---
 libi2pd/Transports.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/libi2pd/Transports.cpp b/libi2pd/Transports.cpp
index c559c65c..b76df540 100644
--- a/libi2pd/Transports.cpp
+++ b/libi2pd/Transports.cpp
@@ -397,16 +397,24 @@ namespace transport
 					if (!peer.numAttempts) // NTCP2 ipv6
 					{
 						if (context.SupportsV6 ())
+						{	
 							address = peer.router->GetPublishedNTCP2V6Address ();
+							if (address && m_CheckReserved && !i2p::util::net::IsInReservedRange(address->host))
+								address = nullptr;
+						}	
 						peer.numAttempts++;
 					}
 					if (!address && peer.numAttempts == 1) // NTCP2 ipv4	
 					{	
-						if (context.SupportsV4 ())
+						if (context.SupportsV4 () && !peer.router->IsUnreachable ())
+						{	
 							address = peer.router->GetPublishedNTCP2V4Address ();
+							if (address && m_CheckReserved && !i2p::util::net::IsInReservedRange(address->host))
+								address = nullptr;
+						}	
 						peer.numAttempts++;
 					}	
-					if (address && !peer.router->IsUnreachable () && (!m_CheckReserved || !i2p::util::net::IsInReservedRange(address->host)))
+					if (address)
 					{
 						auto s = std::make_shared<NTCP2Session> (*m_NTCP2Server, peer.router, address);