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

Console: fixup ipv4/6 badges; don't show decimal points for 0 bytes

Browse source 
(cherry picked from commit 4c25abe37f)
This commit is contained in:
dr|z3d 2021-09-12 23:27:52 +00:00
parent d26c05c3c1
commit 76f8ff6079
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
daemon/HTTPServer.cpp
View file

@ -678,11 +678,11 @@ namespace http {
{ {
s << "<tr><td>" << tr("Network Status") << "</td><td id=\"netstatus\">"; s << "<tr><td>" << tr("Network Status") << "</td><td id=\"netstatus\">";
if (i2p::context.SupportsV4 ()) { if (i2p::context.SupportsV4 ()) {
s << "<span class=\"badge\">" >> tr("IPv4") << "</span>"; s << "<span class=\"badge\">" << tr("IPv4") << "</span> ";
ShowNetworkStatus (s, i2p::context.GetStatus ()); ShowNetworkStatus (s, i2p::context.GetStatus ());
} }
if (i2p::context.SupportsV6 ()) { if (i2p::context.SupportsV6 ()) {
s << "<span class=\"badge\">" >> tr("IPv6") << "</span>"; s << "<span class=\"badge\">" << tr("IPv6") << "</span> ";
ShowNetworkStatus (s, i2p::context.GetStatusV6 ()); ShowNetworkStatus (s, i2p::context.GetStatusV6 ());
} }
s << "</td></tr>\r\n"; s << "</td></tr>\r\n";
@ -703,7 +703,8 @@ namespace http {
s << "<tr><td>" << tr("Bandwidth") << "</td><td><span class=\"router recvd\">"; s << "<tr><td>" << tr("Bandwidth") << "</td><td><span class=\"router recvd\">";
s << std::fixed << std::setprecision(0); s << std::fixed << std::setprecision(0);
if (i2p::transport::transports.GetInBandwidth () > 1024*1024*1024 || if (i2p::transport::transports.GetInBandwidth () > 1024*1024*1024 ||
i2p::transport::transports.GetInBandwidth () < 1024) i2p::transport::transports.GetInBandwidth () < 1024 &&
i2p::transport::transports.GetInBandwidth () > 0)
s << std::fixed << std::setprecision(2); s << std::fixed << std::setprecision(2);
else if (i2p::transport::transports.GetInBandwidth () > 1024*1024) else if (i2p::transport::transports.GetInBandwidth () > 1024*1024)
s << std::fixed << std::setprecision(1); s << std::fixed << std::setprecision(1);
@ -711,7 +712,8 @@ namespace http {
s << "</span> <span class=\"hide\">/</span> <span class=\"router sent\">"; s << "</span> <span class=\"hide\">/</span> <span class=\"router sent\">";
s << std::fixed << std::setprecision(0); s << std::fixed << std::setprecision(0);
if (i2p::transport::transports.GetOutBandwidth () > 1024*1024*1024 || if (i2p::transport::transports.GetOutBandwidth () > 1024*1024*1024 ||
i2p::transport::transports.GetOutBandwidth () < 1024) i2p::transport::transports.GetOutBandwidth () < 1024 &&
i2p::transport::transports.GetOutBandwidth () > 0)
s << std::fixed << std::setprecision(2); s << std::fixed << std::setprecision(2);
else if (i2p::transport::transports.GetOutBandwidth () > 1024*1024) else if (i2p::transport::transports.GetOutBandwidth () > 1024*1024)
s << std::fixed << std::setprecision(1); s << std::fixed << std::setprecision(1);
@ -720,8 +722,10 @@ namespace http {
if ((i2p::context.AcceptsTunnels() || i2p::tunnel::tunnels.CountTransitTunnels()) && if ((i2p::context.AcceptsTunnels() || i2p::tunnel::tunnels.CountTransitTunnels()) &&
(i2p::transport::transports.GetTotalReceivedBytes () > 0)) { (i2p::transport::transports.GetTotalReceivedBytes () > 0)) {
s << std::fixed << std::setprecision(0);
if (i2p::transport::transports.GetTransitBandwidth () > 1024*1024*1024 || if (i2p::transport::transports.GetTransitBandwidth () > 1024*1024*1024 ||
i2p::transport::transports.GetTransitBandwidth () < 1024) i2p::transport::transports.GetTransitBandwidth () < 1024 &&
i2p::transport::transports.GetTransitBandwidth () > 0)
s << std::fixed << std::setprecision(2); s << std::fixed << std::setprecision(2);
else if (i2p::transport::transports.GetTransitBandwidth () > 1024*1024) else if (i2p::transport::transports.GetTransitBandwidth () > 1024*1024)
s << std::fixed << std::setprecision(1); s << std::fixed << std::setprecision(1);
@ -752,13 +756,12 @@ namespace http {
(i2p::transport::transports.GetTotalReceivedBytes () > 0)) { (i2p::transport::transports.GetTotalReceivedBytes () > 0)) {
s << " <span class=\"hide\">/</span> <span class=\"transit sent\" data-tooltip=\""; s << " <span class=\"hide\">/</span> <span class=\"transit sent\" data-tooltip=\"";
s << tr("Total transit data transferred") << "\">"; s << tr("Total transit data transferred") << "\">";
s << std::fixed << std::setprecision(0); s << std::fixed << std::setprecision(0); // should set 0 bytes to no decimal places, but doesn't!
if (i2p::transport::transports.GetTotalTransitTransmittedBytes () > 1024*1024*1024) if (i2p::transport::transports.GetTotalTransitTransmittedBytes () > 1024*1024*1024)
s << std::fixed << std::setprecision(2); s << std::fixed << std::setprecision(2);
else if (i2p::transport::transports.GetTotalTransitTransmittedBytes () > 1024*1024) else if (i2p::transport::transports.GetTotalTransitTransmittedBytes () > 1024*1024)
s << std::fixed << std::setprecision(1); s << std::fixed << std::setprecision(1);
ShowTraffic (s, i2p::transport::transports.GetTotalTransitTransmittedBytes ()); ShowTraffic (s, i2p::transport::transports.GetTotalTransitTransmittedBytes ());
s << std::fixed << std::setprecision(0);
s << "</span>"; s << "</span>";
} }
s << "</td></tr>\r\n"; s << "</td></tr>\r\n";