mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2026-05-30 22:34:02 +00:00
Merge pull request #2299 from LLE8/better_display_addresses
Webconsole: Better display of the external addresses
This commit is contained in:
+14
-10
@@ -371,18 +371,22 @@ namespace http {
|
||||
s << tr("Unknown");
|
||||
}
|
||||
bool v6 = address->IsV6 ();
|
||||
if (v6)
|
||||
{
|
||||
if (address->IsV4 ()) s << "v4";
|
||||
s << "v6";
|
||||
if (v6) {
|
||||
s << "_v6";
|
||||
}
|
||||
else {
|
||||
s << "_v4";
|
||||
}
|
||||
s << "</td>\r\n";
|
||||
if (address->published)
|
||||
s << "<td>" << (v6 ? "[" : "") << address->host.to_string() << (v6 ? "]:" : ":") << address->port << "</td>\r\n";
|
||||
if (address->published) {
|
||||
s << "<td style=\"padding-left: 0.5em;\">";
|
||||
s << (v6 ? "[" : "") << address->host.to_string() << (v6 ? "]:" : ":");
|
||||
s << address->port << "</td>\r\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
/* tr: Shown when router doesn't publish itself and have "Firewalled" state */
|
||||
s << "<td>" << tr("supported");
|
||||
s << "<td style=\"padding-left: 0.5em;\">" << tr("Supported");
|
||||
if (address->port)
|
||||
s << " :" << address->port;
|
||||
s << "</td>\r\n";
|
||||
@@ -399,15 +403,15 @@ namespace http {
|
||||
if (outputFormat == OutputFormatEnum::forQtUi) {
|
||||
s << "<br>";
|
||||
}
|
||||
s << "<b>" << tr("Routers") << ":</b> " << i2p::data::netdb.GetNumRouters () << " ";
|
||||
s << "<b>" << tr("Floodfills") << ":</b> " << i2p::data::netdb.GetNumFloodfills () << " ";
|
||||
s << "<b>" << tr("Routers") << ":</b> " << i2p::data::netdb.GetNumRouters () << " ";
|
||||
s << "<b>" << tr("Floodfills") << ":</b> " << i2p::data::netdb.GetNumFloodfills () << " ";
|
||||
s << "<b>" << tr("LeaseSets") << ":</b> " << i2p::data::netdb.GetNumLeaseSets () << "<br>\r\n";
|
||||
|
||||
size_t clientTunnelCount = i2p::tunnel::tunnels.CountOutboundTunnels();
|
||||
clientTunnelCount += i2p::tunnel::tunnels.CountInboundTunnels();
|
||||
size_t transitTunnelCount = i2p::tunnel::tunnels.CountTransitTunnels();
|
||||
|
||||
s << "<b>" << tr("Client Tunnels") << ":</b> " << std::to_string(clientTunnelCount) << " ";
|
||||
s << "<b>" << tr("Client Tunnels") << ":</b> " << std::to_string(clientTunnelCount) << " ";
|
||||
s << "<b>" << tr("Transit Tunnels") << ":</b> " << std::to_string(transitTunnelCount) << "<br>\r\n<br>\r\n";
|
||||
|
||||
if (outputFormat==OutputFormatEnum::forWebConsole) {
|
||||
|
||||
Reference in New Issue
Block a user