From 6d7d71bb161562ac3057c59c01737f5516964d30 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sun, 13 Mar 2022 11:58:19 -0400
Subject: [PATCH] don't show address:port for non-published addresses

---
 daemon/HTTPServer.cpp | 48 +++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/daemon/HTTPServer.cpp b/daemon/HTTPServer.cpp
index 2a274f5c..4b6fad8d 100644
--- a/daemon/HTTPServer.cpp
+++ b/daemon/HTTPServer.cpp
@@ -307,42 +307,32 @@ namespace http {
 			s << "<b>"<< tr("Our external address") << ":</b>" << "<br>\r\n<table class=\"extaddr\"><tbody>\r\n";
 			for (const auto& address : i2p::context.GetRouterInfo().GetAddresses())
 			{
-				s << "<tr>\r\n";
-				if (address->IsNTCP2 () && !address->IsPublishedNTCP2 ())
-				{
-					s << "<td>NTCP2";
-					if (address->IsV6 ()) s << "v6";
-					s << "</td><td>" << tr("supported") << "</td>\r\n</tr>\r\n";
-					continue;
-				}
+				s << "<tr>\r\n<td>";
 				switch (address->transportStyle)
 				{
 					case i2p::data::RouterInfo::eTransportNTCP:
-					{
-						s << "<td>NTCP";
-						if (address->IsPublishedNTCP2 ()) s << "2";
-						if (address->IsV6 ()) s << "v6";
-						s << "</td>\r\n";
-						break;
-					}
+						s << "NTCP2";
+					break;
 					case i2p::data::RouterInfo::eTransportSSU:
-					{
-						s << "<td>SSU";
-						if (address->IsV6 ()) s << "v6";
-						s << "</td>\r\n";
-						break;
-					}
+						s << "SSU";
+					break;
 					case i2p::data::RouterInfo::eTransportSSU2:
-					{	
-						s << "<td>SSU2";
-						if (address->IsV6 ()) s << "v6";
-						s << "</td><td>" << tr("supported") << "</td>\r\n</tr>\r\n";
-						break;
-					}	
+						s << "SSU2";
+					break;	
 					default:
-						s << "<td>" << tr("Unknown") << "</td>\r\n";
+						s << tr("Unknown");
 				}
-				s << "<td>" << address->host.to_string() << ":" << address->port << "</td>\r\n</tr>\r\n";
+				if (address->IsV6 ()) 
+				{	
+					if (address->IsV4 ()) s << "v4"; 
+					s << "v6";
+				}	
+				s << "</td>\r\n";
+				if (address->published)
+					s << "<td>" << address->host.to_string() << ":" << address->port << "</td>\r\n";
+				else
+					s << "<td>" << tr("supported") << "</td>\r\n";
+				s << "</tr>\r\n";
 			}
 			s << "</tbody></table>\r\n";
 		}