From 387e51394990c14a4d1e93b070ed2d668e4e6c95 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Tue, 22 Dec 2020 07:36:47 -0500
Subject: [PATCH] Console: Add netdb search by enc. type

---
 .../net/i2p/router/web/helpers/NetDbHelper.java   | 15 ++++++++++++---
 .../net/i2p/router/web/helpers/NetDbRenderer.java |  7 +++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbHelper.java
index bfe48db00..3937da9f1 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbHelper.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
+import net.i2p.crypto.EncType;
 import net.i2p.crypto.SigType;
 import net.i2p.data.DataHelper;
 import net.i2p.util.SystemVersion;
@@ -28,6 +29,7 @@ public class NetDbHelper extends FormHandler {
     private boolean _debug;
     private boolean _graphical;
     private SigType _type;
+    private EncType _etype;
     private String _newNonce;
     private boolean _postOK;
 
@@ -119,6 +121,12 @@ public class NetDbHelper extends FormHandler {
             _type = SigType.parseSigType(f);
     }
 
+    /** @since 0.9.49 */
+    public void setEtype(String f) {
+        if (f != null && f.length() > 0)
+            _etype = EncType.parseEncType(f);
+    }
+
     /** @since 0.9.28 */
     public void setMtu(String f) {
         if (f != null && f.length() > 0)
@@ -271,10 +279,10 @@ public class NetDbHelper extends FormHandler {
             if (_routerPrefix != null || _version != null || _country != null ||
                 _family != null || _caps != null || _ip != null || _sybil != null ||
                 _port != 0 || _type != null || _mtu != null || _ipv6 != null ||
-                _ssucaps != null || _transport != null || _cost != 0) {
+                _ssucaps != null || _transport != null || _cost != 0 || _etype != null) {
                 renderer.renderRouterInfoHTML(_out, _limit, _page,
                                               _routerPrefix, _version, _country,
-                                              _family, _caps, _ip, _sybil, _port, _type,
+                                              _family, _caps, _ip, _sybil, _port, _type, _etype,
                                               _mtu, _ipv6, _ssucaps, _transport, _cost);
             } else if (_lease) {
                 renderer.renderLeaseSetHTML(_out, _debug);
@@ -308,7 +316,7 @@ public class NetDbHelper extends FormHandler {
         if (_routerPrefix != null || _version != null || _country != null ||
             _family != null || _caps != null || _ip != null || _sybil != null ||
             _port != 0 || _type != null || _mtu != null || _ipv6 != null ||
-            _ssucaps != null || _transport != null || _cost != 0)
+            _ssucaps != null || _transport != null || _cost != 0 || _etype != null)
             return 2;
         if (_full == 2)
             return 3;
@@ -369,6 +377,7 @@ public class NetDbHelper extends FormHandler {
                    "<tr><td>Capabilities:</td><td><input type=\"text\" name=\"caps\"></td><td>e.g. f or XOfR</td></tr>\n" +
                    "<tr><td>Cost:</td><td><input type=\"text\" name=\"cost\"></td><td></td></tr>\n" +
                    "<tr><td>Country Code:</td><td><input type=\"text\" name=\"c\"></td><td>e.g. ru</td></tr>\n" +
+                   "<tr><td>Encryption Type:</td><td><input type=\"text\" name=\"etype\"></td><td></td></tr>\n" +
                    "<tr><td>Router Family:</td><td><input type=\"text\" name=\"fam\"></td><td></td></tr>\n" +
                    "<tr><td>Hash Prefix:</td><td><input type=\"text\" name=\"r\"></td><td></td></tr>\n" +
                    "<tr><td>IP or Hostname:</td><td><input type=\"text\" name=\"ip\"></td><td>host name, IPv4, or IPv6, /24,/16,/8 suffixes optional for IPv4, prefix ok for IPv6</td></tr>\n" +
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 799d53866..94a9797ec 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
@@ -104,7 +104,7 @@ class NetDbRenderer {
     public void renderRouterInfoHTML(Writer out, int pageSize, int page,
                                      String routerPrefix, String version,
                                      String country, String family, String caps,
-                                     String ip, String sybil, int port, SigType type,
+                                     String ip, String sybil, int port, SigType type, EncType etype,
                                      String mtu, String ipv6, String ssucaps,
                                      String tr, int cost) throws IOException {
         StringBuilder buf = new StringBuilder(4*1024);
@@ -162,6 +162,8 @@ class NetDbRenderer {
                 ubuf.append("&amp;tr=").append(tr);
             if (type != null)
                 ubuf.append("&amp;type=").append(type);
+            if (etype != null)
+                ubuf.append("&amp;etype=").append(etype);
             if (ip != null)
                 ubuf.append("&amp;ip=").append(ip);
             if (port != 0)
@@ -220,7 +222,8 @@ class NetDbRenderer {
                     // 'O' will catch PO and XO also
                     (caps != null && hasCap(ri, caps)) ||
                     (tr != null && ri.getTargetAddress(tr) != null) ||
-                    (type != null && type == ri.getIdentity().getSigType())) {
+                    (type != null && type == ri.getIdentity().getSigType()) ||
+                    (etype != null && etype == ri.getIdentity().getEncType())) {
                     if (skipped < toSkip) {
                         skipped++;
                         continue;