From b9a5dd48f6a752c1e90e50957381a9208296e512 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 3 Jul 2013 19:14:21 +0000
Subject: [PATCH] Console: Hide dead tunnel pools on /tunnels

---
 .../java/src/net/i2p/router/web/ConfigTunnelsHelper.java    | 2 +-
 .../java/src/net/i2p/router/web/TunnelRenderer.java         | 6 +++++-
 history.txt                                                 | 1 +
 router/java/src/net/i2p/router/RouterVersion.java           | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
index 2f804702c1..85cfd6066e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java
@@ -14,7 +14,7 @@ public class ConfigTunnelsHelper extends HelperBase {
     private static final String HOPS = ngettext("1 hop", "{0} hops");
     private static final String TUNNELS = ngettext("1 tunnel", "{0} tunnels");
 
-    private static final String PROP_ADVANCED = "routerconsole.advanced";
+    static final String PROP_ADVANCED = "routerconsole.advanced";
 
     public String getForm() {
         StringBuilder buf = new StringBuilder(1024);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
index 4fdeb66e0a..6be7466a1e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java
@@ -39,8 +39,12 @@ public class TunnelRenderer {
         Map<Hash, TunnelPool> clientInboundPools = _context.tunnelManager().getInboundClientPools();
         Map<Hash, TunnelPool> clientOutboundPools = _context.tunnelManager().getOutboundClientPools();
         destinations = new ArrayList(clientInboundPools.keySet());
+        boolean debug = _context.getBooleanProperty(ConfigTunnelsHelper.PROP_ADVANCED);
         for (int i = 0; i < destinations.size(); i++) {
             Hash client = destinations.get(i);
+            boolean isLocal = _context.clientManager().isLocal(client);
+            if ((!isLocal) && (!debug))
+                continue;
             TunnelPool in = null;
             TunnelPool outPool = null;
             in = clientInboundPools.get(client);
@@ -53,7 +57,7 @@ public class TunnelRenderer {
                 name = client.toBase64().substring(0,4);
             out.write("<h2><a name=\"" + client.toBase64().substring(0,4)
                       + "\" ></a>" + _("Client tunnels for") + ' ' + _(name));
-            if (_context.clientManager().isLocal(client))
+            if (isLocal)
                 out.write(" (<a href=\"/configtunnels#" + client.toBase64().substring(0,4) +"\">" + _("configure") + "</a>)</h2>\n");
             else
                 out.write(" (" + _("dead") + ")</h2>\n");
diff --git a/history.txt b/history.txt
index 639b2046f3..9ed17d2895 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,5 @@
 2013-07-03 zzz
+ * Console: Hide dead tunnel pools on /tunnels
  * Updater: Fix plugin update checker (ticket #897)
  * Utils: Reduce logging in wrapper log when extracting zip files
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 25340f779d..421ff4f630 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 = 15;
+    public final static long BUILD = 16;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";