exploratory if tunnels are not created yet

HTTPServer.cpp

@@ -238,7 +238,7 @@ namespace util
 	void HTTPConnection::FillContent (std::stringstream& s)
 	{
 		s << "Data path: " << i2p::util::filesystem::GetDataDir().string() << "<BR>" << "<BR>";
-		s << "Our external address:" << "<BR>" << "<BR>";
+		s << "Our external address:" << "<BR>";
 		for (auto& address : i2p::context.GetRouterInfo().GetAddresses())
 		{
 			switch (address.transportStyle) 
@@ -254,6 +254,9 @@ namespace util
 			}
 			s << address.host.to_string() << ":" << address.port << "<BR>";
 		}
+		s << "<BR>Routers: " << i2p::data::netdb.GetNumRouters () << " ";
+		s << "Floodfills: " << i2p::data::netdb.GetNumFloodfills () << " ";
+		s << "LeaseSets: " << i2p::data::netdb.GetNumLeaseSets () << "<BR>";
 		
 		s << "<P>Tunnels</P>";
 		for (auto it: i2p::tunnel::tunnels.GetOutboundTunnels ())

NetDb.cpp

@@ -534,20 +534,20 @@ namespace data
 	
 	void NetDb::Explore ()
 	{	
-		auto exploratoryPool = i2p::tunnel::tunnels.GetExploratoryPool ();
+		CryptoPP::RandomNumberGenerator& rnd = i2p::context.GetRandomNumberGenerator ();
-		auto outbound = exploratoryPool ? exploratoryPool->GetNextOutboundTunnel () : nullptr;
+		uint8_t randomHash[32];
-		auto inbound = exploratoryPool ? exploratoryPool->GetNextInboundTunnel () : nullptr;
+		rnd.GenerateBlock (randomHash, 32);
-		if (outbound && inbound)
+		RequestedDestination * dest = CreateRequestedDestination (IdentHash (randomHash), false, true);
+		auto floodfill = GetClosestFloodfill (randomHash, dest->GetExcludedPeers ());
+		if (floodfill)
 		{	
-			CryptoPP::RandomNumberGenerator& rnd = i2p::context.GetRandomNumberGenerator ();
+			LogPrint ("Exploring new routers ...");
-			uint8_t randomHash[32];
+			auto exploratoryPool = i2p::tunnel::tunnels.GetExploratoryPool ();
-			rnd.GenerateBlock (randomHash, 32);
+			auto outbound = exploratoryPool ? exploratoryPool->GetNextOutboundTunnel () : nullptr;
-			RequestedDestination * dest = CreateRequestedDestination (IdentHash (randomHash), false, true);
+			auto inbound = exploratoryPool ? exploratoryPool->GetNextInboundTunnel () : nullptr;
-			dest->SetLastOutboundTunnel (outbound);
+			if (outbound && inbound)
-			auto floodfill = GetClosestFloodfill (randomHash, dest->GetExcludedPeers ());
-			if (floodfill)
 			{	
-				LogPrint ("Exploring new routers ...");
+				dest->SetLastOutboundTunnel (outbound);
 				std::vector<i2p::tunnel::TunnelMessageBlock> msgs;
 				msgs.push_back (i2p::tunnel::TunnelMessageBlock 
 					{ 
@@ -564,8 +564,14 @@ namespace data
 				outbound->SendTunnelDataMsg (msgs);		
 			}	
 			else
-				DeleteRequestedDestination (dest);
+			{	
+				dest->SetLastOutboundTunnel (nullptr);
+				dest->SetLastReplyTunnel (nullptr);
+				i2p::transports.SendMessage (floodfill->GetIdentHash (), dest->CreateRequestMessage (floodfill->GetIdentHash ()));
+			}	
 		}	
+		else
+			DeleteRequestedDestination (dest);
 	}	
 
 	void NetDb::Publish ()

NetDb.h

@@ -33,6 +33,7 @@ namespace data
 			void ClearExcludedPeers ();
 			const RouterInfo * GetLastRouter () const { return m_LastRouter; };
 			const i2p::tunnel::InboundTunnel * GetLastReplyTunnel () const { return m_LastReplyTunnel; };
+			void SetLastReplyTunnel (i2p::tunnel::InboundTunnel * tunnel) { m_LastReplyTunnel = tunnel; };
 			bool IsExploratory () const { return m_IsExploratory; };
 			bool IsLeaseSet () const { return m_IsLeaseSet; };
 			bool IsExcluded (const IdentHash& ident) const { return m_ExcludedPeers.count (ident); };
@@ -79,6 +80,11 @@ namespace data
 
 			void PostI2NPMsg (I2NPMessage * msg);
 
+			// for web interface
+			int GetNumRouters () const { return m_RouterInfos.size (); };
+			int GetNumFloodfills () const { return m_Floodfills.size (); };
+			int GetNumLeaseSets () const { return m_LeaseSets.size (); };
+			
 		private:
 
 			bool CreateNetDb(boost::filesystem::path directory);