From 2fab97fb205700feb503a8e5ba6a880ea04e3f2e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 25 May 2018 17:35:29 +0000
Subject: [PATCH] Console: Fix changes to wrong tunnel on /configtunnels
 (ticket #2227)

---
 .../net/i2p/router/web/helpers/ConfigTunnelsHandler.java  | 8 +++++++-
 .../net/i2p/router/web/helpers/ConfigTunnelsHelper.java   | 4 +++-
 history.txt                                               | 5 ++++-
 router/java/src/net/i2p/router/RouterVersion.java         | 2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHandler.java
index b15d9f48d..b11e6e689 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHandler.java
@@ -76,7 +76,13 @@ public class ConfigTunnelsHandler extends FormHandler {
                 continue;
             }
             
-            in.setLength(getInt(_settings.get(index + ".depthInbound")));
+            Object di = _settings.get(index + ".depthInbound");
+            if (di == null) {
+                // aliased pools
+                index++;
+                continue;
+            }
+            in.setLength(getInt(di));
             out.setLength(getInt(_settings.get(index + ".depthOutbound")));
             in.setLengthVariance(getInt(_settings.get(index + ".varianceInbound")));
             out.setLengthVariance(getInt(_settings.get(index + ".varianceOutbound")));
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java
index 4530e8378..1611490da 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java
@@ -40,8 +40,10 @@ public class ConfigTunnelsHelper extends HelperBase {
             TunnelPoolSettings out = _context.tunnelManager().getOutboundSettings(dest.calculateHash());
             
             if (in == null || in.getAliasOf() != null ||
-                out == null || out.getAliasOf() != null)
+                out == null || out.getAliasOf() != null) {
+                cur++;
                 continue;
+            }
             
             String name = in.getDestinationNickname();
             if (name == null)
diff --git a/history.txt b/history.txt
index 294e359b2..d834013fe 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2018-05-25 zzz
+ * Console: Fix changes to wrong tunnel on /configtunnels (ticket #2227)
+
 2018-05-06 meeh
  * launchers:
    - rewritten some logic
@@ -11,7 +14,7 @@
 
 2018-05-05 zzz
  * i2ptunnel:
-   - Link to SSL wizard
+   - Link to SSL wizard (ticket #2159)
    - Enable SSL to i2p hosts by default
  * Streaming: Don't send HTTP response on an HTTPS connection
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f2522cd4e..7ca1a3ec2 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 9;
+    public final static long BUILD = 10;
 
     /** for example "-test" */
     public final static String EXTRA = "";