From a34bf5d408fc11b199a43a75cf7b980fafd71981 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sat, 10 Sep 2022 12:50:29 -0400
Subject: [PATCH] Console: Include SSU2 addresses in transports chart

Linkify router family name in RI
---
 .../net/i2p/router/web/helpers/NetDbRenderer.java  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
index 7b268c875..a2454a41d 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
@@ -1111,11 +1111,15 @@ class NetDbRenderer {
             if (family != null) {
                 FamilyKeyCrypto fkc = _context.router().getFamilyKeyCrypto();
                 if (fkc != null) {
+                    String f = DataHelper.stripHTML(family);
                     buf.append("<tr><td><b>").append(_t("Family"))
                        .append(":</b><td colspan=\"2\"><span class=\"netdb_info\">")
                        .append(fkc.verify(info) == FamilyKeyCrypto.Result.STORED_KEY ? "Verified" : "Unverified")
-                       .append(' ').append(DataHelper.stripHTML(family))
-                       .append("</span></td></tr>\n");
+                       .append(" <a href=\"/netdb?fam=")
+                       .append(f)
+                       .append("\">")
+                       .append(f)
+                       .append("</a></span></td></tr>\n");
                 }
             }
         }
@@ -1137,10 +1141,10 @@ class NetDbRenderer {
         int rv = 0;
         for (RouterAddress addr : info.getAddresses()) {
             String style = addr.getTransportStyle();
-            if (style.equals("NTCP") || style.equals("NTCP2")) {
+            if (style.equals("NTCP2") || style.equals("NTCP")) {
                 rv |= NTCP;
-            } else if (style.equals("SSU")) {
-                if (addr.getOption("iport0") != null)
+            } else if (style.equals("SSU") || style.equals("SSU2")) {
+                if (addr.getOption("itag0") != null)
                     rv |= SSUI;
                 else
                     rv |= SSU;