echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Console: Don't list aliased tunnels separately on /tunnels and /configtunnels

Browse Source
This commit is contained in:
zzz
2017-12-07 15:47:12 +00:00
parent 3291b761e8
commit 0c4f945408
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java
View File

@ -38,7 +38,9 @@ public class ConfigTunnelsHelper extends HelperBase {
TunnelPoolSettings in = _context.tunnelManager().getInboundSettings(dest.calculateHash()); TunnelPoolSettings in = _context.tunnelManager().getInboundSettings(dest.calculateHash());
TunnelPoolSettings out = _context.tunnelManager().getOutboundSettings(dest.calculateHash()); TunnelPoolSettings out = _context.tunnelManager().getOutboundSettings(dest.calculateHash());
if ( (in == null) || (out == null) ) continue; if (in == null || in.getAliasOf() != null ||
out == null || out.getAliasOf() != null)
continue;
String name = in.getDestinationNickname(); String name = in.getDestinationNickname();
if (name == null) if (name == null)

26
apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java
View File

@ -8,6 +8,7 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.data.Hash; import net.i2p.data.Hash;
@ -50,6 +51,11 @@ class TunnelRenderer {
continue; continue;
TunnelPool in = clientInboundPools.get(client); TunnelPool in = clientInboundPools.get(client);
TunnelPool outPool = clientOutboundPools.get(client); TunnelPool outPool = clientOutboundPools.get(client);
if ((in != null && in.getSettings().getAliasOf() != null) ||
(outPool != null && outPool.getSettings().getAliasOf() != null)) {
// skip aliases, we will print a header under the main tunnel pool below
continue;
}
// TODO the following code is duplicated in SummaryHelper // TODO the following code is duplicated in SummaryHelper
String name = (in != null) ? in.getSettings().getDestinationNickname() : null; String name = (in != null) ? in.getSettings().getDestinationNickname() : null;
if ( (name == null) && (outPool != null) ) if ( (name == null) && (outPool != null) )
@ -62,6 +68,26 @@ class TunnelRenderer {
out.write(" <a href=\"/configtunnels#" + client.toBase64().substring(0,4) +"\" title=\"" + _t("Configure tunnels for session") + "\">[" + _t("configure") + "]</a></h3>\n"); out.write(" <a href=\"/configtunnels#" + client.toBase64().substring(0,4) +"\" title=\"" + _t("Configure tunnels for session") + "\">[" + _t("configure") + "]</a></h3>\n");
else else
out.write(" (" + _t("dead") + ")</h3>\n"); out.write(" (" + _t("dead") + ")</h3>\n");
if (in != null) {
// list aliases
Set<Hash> aliases = in.getSettings().getAliases();
if (aliases != null) {
for (Hash a : aliases) {
TunnelPool ain = clientInboundPools.get(a);
if (ain != null) {
String aname = ain.getSettings().getDestinationNickname();
if (aname == null)
aname = a.toBase64().substring(0,4);
out.write("<h3 class=\"tabletitle\" id=\"" + a.toBase64().substring(0,4)
+ "\" >" + _t("Client tunnels for") + ' ' + DataHelper.escapeHTML(_t(aname)));
if (isLocal)
out.write(" <a href=\"/configtunnels#" + client.toBase64().substring(0,4) +"\" title=\"" + _t("Configure tunnels for session") + "\">[" + _t("configure") + "]</a></h3>\n");
else
out.write(" (" + _t("dead") + ")</h3>\n");
}
}
}
}
renderPool(out, in, outPool); renderPool(out, in, outPool);
} }