diff --git a/HTTPServer.cpp b/HTTPServer.cpp
index c2a235fa..038f6321 100644
--- a/HTTPServer.cpp
+++ b/HTTPServer.cpp
@@ -238,7 +238,7 @@ namespace util
void HTTPConnection::FillContent (std::stringstream& s)
{
s << "Data path: " << i2p::util::filesystem::GetDataDir().string() << "
" << "
";
- s << "Our external address:" << "
" << "
";
+ s << "Our external address:" << "
";
for (auto& address : i2p::context.GetRouterInfo().GetAddresses())
{
switch (address.transportStyle)
@@ -254,7 +254,10 @@ namespace util
}
s << address.host.to_string() << ":" << address.port << "
";
}
-
+ s << "
Routers: " << i2p::data::netdb.GetNumRouters () << " ";
+ s << "Floodfills: " << i2p::data::netdb.GetNumFloodfills () << " ";
+ s << "LeaseSets: " << i2p::data::netdb.GetNumLeaseSets () << "
";
+
s << "
Tunnels
"; for (auto it: i2p::tunnel::tunnels.GetOutboundTunnels ()) { diff --git a/NetDb.cpp b/NetDb.cpp index 553ee52b..e80c5f78 100644 --- a/NetDb.cpp +++ b/NetDb.cpp @@ -533,21 +533,21 @@ namespace data } void NetDb::Explore () - { - auto exploratoryPool = i2p::tunnel::tunnels.GetExploratoryPool (); - auto outbound = exploratoryPool ? exploratoryPool->GetNextOutboundTunnel () : nullptr; - auto inbound = exploratoryPool ? exploratoryPool->GetNextInboundTunnel () : nullptr; - if (outbound && inbound) - { - CryptoPP::RandomNumberGenerator& rnd = i2p::context.GetRandomNumberGenerator (); - uint8_t randomHash[32]; - rnd.GenerateBlock (randomHash, 32); - RequestedDestination * dest = CreateRequestedDestination (IdentHash (randomHash), false, true); - dest->SetLastOutboundTunnel (outbound); - auto floodfill = GetClosestFloodfill (randomHash, dest->GetExcludedPeers ()); - if (floodfill) + { + CryptoPP::RandomNumberGenerator& rnd = i2p::context.GetRandomNumberGenerator (); + uint8_t randomHash[32]; + rnd.GenerateBlock (randomHash, 32); + RequestedDestination * dest = CreateRequestedDestination (IdentHash (randomHash), false, true); + auto floodfill = GetClosestFloodfill (randomHash, dest->GetExcludedPeers ()); + if (floodfill) + { + LogPrint ("Exploring new routers ..."); + auto exploratoryPool = i2p::tunnel::tunnels.GetExploratoryPool (); + auto outbound = exploratoryPool ? exploratoryPool->GetNextOutboundTunnel () : nullptr; + auto inbound = exploratoryPool ? exploratoryPool->GetNextInboundTunnel () : nullptr; + if (outbound && inbound) { - LogPrint ("Exploring new routers ..."); + dest->SetLastOutboundTunnel (outbound); std::vector