Merge ff0b6a6a6a into eadeea76e7

libi2pd/Profiling.cpp

@@ -278,15 +278,6 @@ namespace data
 			return it->second->IsUnreachable ();
 		return false;
 	}	
-
-	bool IsRouterDuplicated (const IdentHash& identHash)
-	{
-		std::lock_guard<std::mutex> l(g_ProfilesMutex);
-		auto it = g_Profiles.find (identHash);
-		if (it != g_Profiles.end ())
-			return it->second->IsDuplicated ();
-		return false;
-	}	
 		
 	void InitProfilesStorage ()
 	{

libi2pd/Profiling.h

@@ -113,7 +113,6 @@ namespace data
 
 	std::shared_ptr<RouterProfile> GetRouterProfile (const IdentHash& identHash);
 	bool IsRouterBanned (const IdentHash& identHash); // check only existing profiles
-	bool IsRouterDuplicated (const IdentHash& identHash); // check only existing profiles
 	void InitProfilesStorage ();
 	std::future<void> DeleteObsoleteProfiles ();
 	void SaveProfiles ();

libi2pd/TransitTunnel.cpp

@@ -349,23 +349,15 @@ namespace tunnel
 				
 				if (!retCode)
 				{
-					i2p::data::IdentHash nextIdent(clearText + SHORT_REQUEST_RECORD_NEXT_IDENT_OFFSET);
+					// create new transit tunnel
-					bool isEndpoint = clearText[SHORT_REQUEST_RECORD_FLAG_OFFSET] & TUNNEL_BUILD_RECORD_ENDPOINT_FLAG;
+					transitTunnel = i2p::tunnel::CreateTransitTunnel (
-					if (isEndpoint || !i2p::data::IsRouterDuplicated (nextIdent))
+						bufbe32toh (clearText + SHORT_REQUEST_RECORD_RECEIVE_TUNNEL_OFFSET),
-					{	
+						clearText + SHORT_REQUEST_RECORD_NEXT_IDENT_OFFSET,
-						// create new transit tunnel
+						bufbe32toh (clearText + SHORT_REQUEST_RECORD_NEXT_TUNNEL_OFFSET),
-						transitTunnel = CreateTransitTunnel (
+						layerKey, ivKey,
-							bufbe32toh (clearText + SHORT_REQUEST_RECORD_RECEIVE_TUNNEL_OFFSET),
+						clearText[SHORT_REQUEST_RECORD_FLAG_OFFSET] & TUNNEL_BUILD_RECORD_GATEWAY_FLAG,
-							nextIdent,
+						clearText[SHORT_REQUEST_RECORD_FLAG_OFFSET] & TUNNEL_BUILD_RECORD_ENDPOINT_FLAG);
-							bufbe32toh (clearText + SHORT_REQUEST_RECORD_NEXT_TUNNEL_OFFSET),
+					if (!AddTransitTunnel (transitTunnel))
-							layerKey, ivKey,
-							clearText[SHORT_REQUEST_RECORD_FLAG_OFFSET] & TUNNEL_BUILD_RECORD_GATEWAY_FLAG,
-							isEndpoint);
-						if (!AddTransitTunnel (transitTunnel))
-							retCode = 30;
-					}
-					else
-						// decline tunnel going to duplicated router 
 						retCode = 30;
 				}
 
@@ -485,32 +477,23 @@ namespace tunnel
 							accept = false;
 					}	
 				}	
-					
+				// replace record to reply
 				if (accept)
 				{
-					i2p::data::IdentHash nextIdent(clearText + ECIES_BUILD_REQUEST_RECORD_NEXT_IDENT_OFFSET);
+					auto transitTunnel = i2p::tunnel::CreateTransitTunnel (
-					bool isEndpoint = clearText[ECIES_BUILD_REQUEST_RECORD_FLAG_OFFSET] & TUNNEL_BUILD_RECORD_ENDPOINT_FLAG;
+							bufbe32toh (clearText + ECIES_BUILD_REQUEST_RECORD_RECEIVE_TUNNEL_OFFSET),
-					if (isEndpoint || !i2p::data::IsRouterDuplicated (nextIdent))
+							clearText + ECIES_BUILD_REQUEST_RECORD_NEXT_IDENT_OFFSET,
-					{	
+							bufbe32toh (clearText + ECIES_BUILD_REQUEST_RECORD_NEXT_TUNNEL_OFFSET),
-						auto transitTunnel = CreateTransitTunnel (
+							clearText + ECIES_BUILD_REQUEST_RECORD_LAYER_KEY_OFFSET,
-								bufbe32toh (clearText + ECIES_BUILD_REQUEST_RECORD_RECEIVE_TUNNEL_OFFSET),
+							clearText + ECIES_BUILD_REQUEST_RECORD_IV_KEY_OFFSET,
-								nextIdent,
+							clearText[ECIES_BUILD_REQUEST_RECORD_FLAG_OFFSET] & TUNNEL_BUILD_RECORD_GATEWAY_FLAG,
-								bufbe32toh (clearText + ECIES_BUILD_REQUEST_RECORD_NEXT_TUNNEL_OFFSET),
+							clearText[ECIES_BUILD_REQUEST_RECORD_FLAG_OFFSET] & TUNNEL_BUILD_RECORD_ENDPOINT_FLAG);
-								clearText + ECIES_BUILD_REQUEST_RECORD_LAYER_KEY_OFFSET,
+					if (!AddTransitTunnel (transitTunnel))
-								clearText + ECIES_BUILD_REQUEST_RECORD_IV_KEY_OFFSET,
-								clearText[ECIES_BUILD_REQUEST_RECORD_FLAG_OFFSET] & TUNNEL_BUILD_RECORD_GATEWAY_FLAG,
-								isEndpoint);
-						if (!AddTransitTunnel (transitTunnel))
-							retCode = 30;
-					}	
-					else
-						// decline tunnel going to duplicated router 
 						retCode = 30;
 				}
 				else
 					retCode = 30; // always reject with bandwidth reason (30)
 
-				// replace record to reply
 				memset (record + ECIES_BUILD_RESPONSE_RECORD_OPTIONS_OFFSET, 0, 2); // no options
 				record[ECIES_BUILD_RESPONSE_RECORD_RET_OFFSET] = retCode;
 				// encrypt reply

libi2pd_client/AddressBook.cpp

@@ -902,7 +902,7 @@ namespace client
 		if (m_AddressCacheUpdateTimer)
 		{	
 			m_AddressCacheUpdateTimer->expires_from_now (boost::posix_time::seconds(ADDRESS_CACHE_UPDATE_INTERVAL ));
-			m_AddressCacheUpdateTimer->async_wait (
+			m_SubscriptionsUpdateTimer->async_wait (
 				[this](const boost::system::error_code& ecode) 
 				{
 					if (ecode != boost::asio::error::operation_aborted)