Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-29 04:07:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Console: separate sections for exploratory and service tunnels

Browse source
This commit is contained in:
dr|z3d 2021-08-19 23:47:06 +00:00
parent d85d9d0224
commit 53521fbf85
1 changed files with 142 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

188
daemon/HTTPServer.cpp
View file

@ -439,20 +439,61 @@ namespace http {
else if (state == "established") stateText = tr("established"); else if (state == "established") stateText = tr("established");
else stateText = tr("unknown"); else stateText = tr("unknown");
s << "<span class=\"tunnel " << state << ((explr) ? " exploratory" : "") if (!explr) {
<< "\" data-tooltip=\"" << stateText << ((explr) ? " (" + tr("exploratory") + ")" : "") << "\">" s << "<span class=\"tunnel " << state << ((explr) ? " exploratory" : "")
<< stateText << ((explr) ? " (" + tr("exploratory") + ")" : "") << "</span>"; << "\" data-tooltip=\"" << stateText << ((explr) ? " (" + tr("exploratory") + ")" : "") << "\">"
s << std::fixed << std::setprecision(0); << stateText << ((explr) ? " (" + tr("exploratory") + ")" : "") << "</span>";
if (bytes > 1024 * 1024 * 1024) { s << std::fixed << std::setprecision(0);
s << std::fixed << std::setprecision(2); if (bytes > 1024 * 1024 * 1024) {
s << " <span class=\"transferred\">" << (double) (bytes / 1024 / 1024 / 1024) << "G</span>\r\n"; s << std::fixed << std::setprecision(2);
} else if (bytes > 1024 * 1024) { s << " <span class=\"transferred\">" << (double) (bytes / 1024 / 1024 / 1024) << "G</span>\r\n";
s << std::fixed << std::setprecision(1); } else if (bytes > 1024 * 1024) {
s << " <span class=\"transferred\">" << (double) (bytes / 1024 / 1024) << "M</span>\r\n"; s << std::fixed << std::setprecision(1);
} else if (bytes > 1024) { s << " <span class=\"transferred\">" << (double) (bytes / 1024 / 1024) << "M</span>\r\n";
s << " <span class=\"transferred\">" << (int) (bytes / 1024) << "K</span>\r\n"; } else if (bytes > 1024) {
} else { s << " <span class=\"transferred\">" << (int) (bytes / 1024) << "K</span>\r\n";
s << " <span class=\"transferred\">" << (int) (bytes) << "B</span>\r\n"; } else {
s << " <span class=\"transferred\">" << (int) (bytes) << "B</span>\r\n";
}
}
}
static void ShowExploratoryTunnelDetails (std::stringstream& s, enum i2p::tunnel::TunnelState eState, bool explr, double bytes)
{
std::string state, stateText;
switch (eState) {
case i2p::tunnel::eTunnelStateBuildReplyReceived :
case i2p::tunnel::eTunnelStatePending : state = "building"; break;
case i2p::tunnel::eTunnelStateBuildFailed :
case i2p::tunnel::eTunnelStateTestFailed :
case i2p::tunnel::eTunnelStateFailed : state = "failed"; break;
case i2p::tunnel::eTunnelStateExpiring : state = "expiring"; break;
case i2p::tunnel::eTunnelStateEstablished : state = "established"; break;
default: state = "unknown"; break;
}
if (state == "building") stateText = tr("building");
else if (state == "failed") stateText = tr("failed");
else if (state == "expiring") stateText = tr("expiring");
else if (state == "established") stateText = tr("established");
else stateText = tr("unknown");
if (explr) {
s << "<span class=\"tunnel " << state << " exploratory"
<< "\" data-tooltip=\"" << stateText << " (" << tr("exploratory") << ")" << "\">"
<< stateText << " (" << tr("exploratory") << ")</span>";
s << std::fixed << std::setprecision(0);
if (bytes > 1024 * 1024 * 1024) {
s << std::fixed << std::setprecision(2);
s << " <span class=\"transferred\">" << (double) (bytes / 1024 / 1024 / 1024) << "G</span>\r\n";
} else if (bytes > 1024 * 1024) {
s << std::fixed << std::setprecision(1);
s << " <span class=\"transferred\">" << (double) (bytes / 1024 / 1024) << "M</span>\r\n";
} else if (bytes > 1024) {
s << " <span class=\"transferred\">" << (int) (bytes / 1024) << "K</span>\r\n";
} else {
s << " <span class=\"transferred\">" << (int) (bytes) << "B</span>\r\n";
}
} }
} }
@ -1052,47 +1093,102 @@ namespace http {
auto ExplPool = i2p::tunnel::tunnels.GetExploratoryPool (); auto ExplPool = i2p::tunnel::tunnels.GetExploratoryPool ();
s << "<tr><td class=\"center nopadding\" colspan=\"2\">\r\n"; s << "<tr><td class=\"center nopadding\" colspan=\"2\">\r\n";
s << "<div class=\"slide\">\r\n<input hidden type=\"checkbox\" class=\"toggle\" id=\"slide_tunnels_client\" />\r\n"
<< "<label for=\"slide_tunnels_client\">" << tr("Client Tunnels") << " <span class=\"hide\">[</span><span class=\"count\">" << "in/out"
s << "<div class=\"slide\">\r\n<input hidden type=\"checkbox\" class=\"toggle\" id=\"slide_tunnels_exploratory\" />\r\n"
<< "<label for=\"slide_tunnels_exploratory\">" << tr("Exploratory Tunnels") << " <span class=\"hide\">[</span><span class=\"count\">" << "in/out"
<< "</span><span class=\"hide\">]</span></label>\r\n"; // TODO: separate client & exploratory tunnels into sections and flag individual services? << "</span><span class=\"hide\">]</span></label>\r\n"; // TODO: separate client & exploratory tunnels into sections and flag individual services?
s << "<div class=\"slidecontent\">\r\n<div class=\"list\">\r\n"; s << "<div class=\"slidecontent\">\r\n<div class=\"list\">\r\n";
for (auto & it : i2p::tunnel::tunnels.GetInboundTunnels ()) { for (auto & it : i2p::tunnel::tunnels.GetInboundTunnels ()) {
s << "<div class=\"listitem in\">" if (it->GetTunnelPool () == ExplPool) {
<< "<span class=\"arrowdown\" data-tooltip=\"" << tr("Inbound") << "\">[" << tr("In") << "] </span>" s << "<div class=\"listitem in\">"
<< "<span class=\"chain inbound\">"; << "<span class=\"arrowdown\" data-tooltip=\"" << tr("Inbound") << "\">[" << tr("In") << "] </span>"
it->Print(s); << "<span class=\"chain inbound\">";
if(it->LatencyIsKnown()) { it->Print(s);
s << " <span class=\"latency\" data-tooltip=\"" << tr("Average tunnel latency") << "\">"; if(it->LatencyIsKnown()) {
if (it->GetMeanLatency() >= 1000) { s << " <span class=\"latency\" data-tooltip=\"" << tr("Average tunnel latency") << "\">";
s << std::fixed << std::setprecision(2); if (it->GetMeanLatency() >= 1000) {
s << (double) it->GetMeanLatency() / 1000 << tr(/* tr: seconds */ "s") << "</span> "; s << std::fixed << std::setprecision(2);
} else { s << (double) it->GetMeanLatency() / 1000 << tr(/* tr: seconds */ "s") << "</span> ";
s << it->GetMeanLatency() << tr(/* tr: Milliseconds */ "ms") << "</span> "; } else {
s << it->GetMeanLatency() << tr(/* tr: Milliseconds */ "ms") << "</span> ";
}
} else { // placeholder for alignment
s << " <span class=\"latency unknown\" data-tooltip=\"" << tr("Unknown tunnel latency") << "\">---&nbsp;</span> ";
} }
} else { // placeholder for alignment ShowExploratoryTunnelDetails(s, it->GetState (), (it->GetTunnelPool () == ExplPool), it->GetNumReceivedBytes ());
s << " <span class=\"latency unknown\" data-tooltip=\"" << tr("Unknown tunnel latency") << "\">---&nbsp;</span> "; s << "</span></div>\r\n";
} }
ShowTunnelDetails(s, it->GetState (), (it->GetTunnelPool () == ExplPool), it->GetNumReceivedBytes ());
s << "</span></div>\r\n";
} }
for (auto & it : i2p::tunnel::tunnels.GetOutboundTunnels ()) { for (auto & it : i2p::tunnel::tunnels.GetOutboundTunnels ()) {
s << "<div class=\"listitem out\">" if (it->GetTunnelPool () == ExplPool) {
<< "<span class=\"arrowup\" data-tooltip=\"" << tr("Outbound") << "\">[" << tr("Out") << "] </span>" s << "<div class=\"listitem out\">"
<< "<span class=\"chain outbound\">"; << "<span class=\"arrowup\" data-tooltip=\"" << tr("Outbound") << "\">[" << tr("Out") << "] </span>"
it->Print(s); << "<span class=\"chain outbound\">";
if(it->LatencyIsKnown()) { it->Print(s);
s << " <span class=\"latency\" data-tooltip=\"" << tr("Average tunnel latency") << "\">"; if(it->LatencyIsKnown()) {
if (it->GetMeanLatency() >= 1000) { s << " <span class=\"latency\" data-tooltip=\"" << tr("Average tunnel latency") << "\">";
s << std::fixed << std::setprecision(2); if (it->GetMeanLatency() >= 1000) {
s << (double) it->GetMeanLatency() / 1000 << tr(/* tr: seconds */ "s") << "</span> "; s << std::fixed << std::setprecision(2);
} else { s << (double) it->GetMeanLatency() / 1000 << tr(/* tr: seconds */ "s") << "</span> ";
s << it->GetMeanLatency() << tr(/* tr: Milliseconds */ "ms") << "</span> "; } else {
s << it->GetMeanLatency() << tr(/* tr: Milliseconds */ "ms") << "</span> ";
}
} else { // placeholder for alignment
s << " <span class=\"latency unknown\" data-tooltip=\"" << tr("Unknown tunnel latency") << "\">---&nbsp;</span> ";
} }
} else { // placeholder for alignment ShowExploratoryTunnelDetails(s, it->GetState (), (it->GetTunnelPool () == ExplPool), it->GetNumSentBytes ());
s << " <span class=\"latency unknown\" data-tooltip=\"" << tr("Unknown tunnel latency") << "\">---&nbsp;</span> "; s << "</span>\r\n</div>\r\n";
}
}
s << "</div>\r\n</div>\r\n</div>\r\n";
s << "<div class=\"slide\">\r\n<input hidden type=\"checkbox\" class=\"toggle\" id=\"slide_tunnels_service\" />\r\n"
<< "<label for=\"slide_tunnels_service\">" << tr("Service Tunnels") << " <span class=\"hide\">[</span><span class=\"count\">" << "in/out"
<< "</span><span class=\"hide\">]</span></label>\r\n"; // TODO: separate client & exploratory tunnels into sections and flag individual services?
s << "<div class=\"slidecontent\">\r\n<div class=\"list\">\r\n";
for (auto & it : i2p::tunnel::tunnels.GetInboundTunnels ()) {
if (it->GetTunnelPool () != ExplPool) {
s << "<div class=\"listitem in\">"
<< "<span class=\"arrowdown\" data-tooltip=\"" << tr("Inbound") << "\">[" << tr("In") << "] </span>"
<< "<span class=\"chain inbound\">";
it->Print(s);
if(it->LatencyIsKnown()) {
s << " <span class=\"latency\" data-tooltip=\"" << tr("Average tunnel latency") << "\">";
if (it->GetMeanLatency() >= 1000) {
s << std::fixed << std::setprecision(2);
s << (double) it->GetMeanLatency() / 1000 << tr(/* tr: seconds */ "s") << "</span> ";
} else {
s << it->GetMeanLatency() << tr(/* tr: Milliseconds */ "ms") << "</span> ";
}
} else { // placeholder for alignment
s << " <span class=\"latency unknown\" data-tooltip=\"" << tr("Unknown tunnel latency") << "\">---&nbsp;</span> ";
}
ShowTunnelDetails(s, it->GetState (), (it->GetTunnelPool () == ExplPool), it->GetNumReceivedBytes ());
s << "</span></div>\r\n";
}
}
for (auto & it : i2p::tunnel::tunnels.GetOutboundTunnels ()) {
if (it->GetTunnelPool () != ExplPool) {
s << "<div class=\"listitem out\">"
<< "<span class=\"arrowup\" data-tooltip=\"" << tr("Outbound") << "\">[" << tr("Out") << "] </span>"
<< "<span class=\"chain outbound\">";
it->Print(s);
if(it->LatencyIsKnown()) {
s << " <span class=\"latency\" data-tooltip=\"" << tr("Average tunnel latency") << "\">";
if (it->GetMeanLatency() >= 1000) {
s << std::fixed << std::setprecision(2);
s << (double) it->GetMeanLatency() / 1000 << tr(/* tr: seconds */ "s") << "</span> ";
} else {
s << it->GetMeanLatency() << tr(/* tr: Milliseconds */ "ms") << "</span> ";
}
} else { // placeholder for alignment
s << " <span class=\"latency unknown\" data-tooltip=\"" << tr("Unknown tunnel latency") << "\">---&nbsp;</span> ";
}
ShowTunnelDetails(s, it->GetState (), (it->GetTunnelPool () == ExplPool), it->GetNumSentBytes ());
s << "</span>\r\n</div>\r\n";
} }
ShowTunnelDetails(s, it->GetState (), (it->GetTunnelPool () == ExplPool), it->GetNumSentBytes ());
s << "</span>\r\n</div>\r\n";
} }
s << "</div>\r\n</div>\r\n</div>\r\n</td></tr>\r\n"; s << "</div>\r\n</div>\r\n</div>\r\n</td></tr>\r\n";
} }