");
for (App app : apps) {
+ String url;
+ if (app.name.equals(website) && app.url.equals("http://127.0.0.1:7658/")) {
+ // fixup eepsite link
+ url = "http://" + _context.portMapper().getHost(PortMapper.SVC_EEPSITE, "127.0.0.1") +
+ ':' + _context.portMapper().getPort(PortMapper.SVC_EEPSITE, 7658) + '/';
+ } else {
+ url = app.url;
+ }
buf.append("
" +
" _dir;
+ private final ConcurrentHashMap _dir;
public static final String SVC_CONSOLE = "console";
public static final String SVC_HTTPS_CONSOLE = "https_console";
@@ -37,7 +38,7 @@ public class PortMapper {
* @param context unused for now
*/
public PortMapper(I2PAppContext context) {
- _dir = new ConcurrentHashMap(8);
+ _dir = new ConcurrentHashMap(8);
}
/**
@@ -46,9 +47,19 @@ public class PortMapper {
* @return success, false if already registered
*/
public boolean register(String service, int port) {
- if (port <= 0)
+ return register(service, "127.0.0.1", port);
+ }
+
+ /**
+ * Add the service
+ * @param port > 0
+ * @return success, false if already registered
+ * @since 0.9.21
+ */
+ public boolean register(String service, String host, int port) {
+ if (port <= 0 || port > 65535)
return false;
- return _dir.putIfAbsent(service, Integer.valueOf(port)) == null;
+ return _dir.putIfAbsent(service, InetSocketAddress.createUnresolved(host, port)) == null;
}
/**
@@ -73,10 +84,24 @@ public class PortMapper {
* @return def if not registered
*/
public int getPort(String service, int def) {
- Integer port = _dir.get(service);
- if (port == null)
+ InetSocketAddress ia = _dir.get(service);
+ if (ia == null)
return def;
- return port.intValue();
+ return ia.getPort();
+ }
+
+ /**
+ * Get the registered host for a service.
+ * Will return "127.0.0.1" if the service was registered without a host.
+ * @param def default
+ * @return def if not registered
+ * @since 0.9.21
+ */
+ public String getHost(String service, String def) {
+ InetSocketAddress ia = _dir.get(service);
+ if (ia == null)
+ return def;
+ return ia.getHostName();
}
/**
@@ -85,10 +110,13 @@ public class PortMapper {
*/
public void renderStatusHTML(Writer out) throws IOException {
List services = new ArrayList(_dir.keySet());
- out.write("
" +
- "" +
+ "" +
"![]()
" +
"
" +
"
\n");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
index 302316217..344d36bd1 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
@@ -11,6 +11,7 @@ import java.util.Map;
import net.i2p.crypto.SigType;
import net.i2p.data.DataHelper;
import net.i2p.router.RouterContext;
+import net.i2p.util.PortMapper;
/**
* Refactored from summarynoframe.jsp to save ~100KB
@@ -146,7 +147,11 @@ public class SummaryBarRenderer {
.append(nbsp(_("Torrents")))
.append("\n" +
- "")
.append(nbsp(_("Website")))
diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
index a0dbdcf55..6d264549b 100644
--- a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
@@ -1254,6 +1254,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
protected String getPrefix() {
StringBuilder buf = new StringBuilder();
buf.append('[');
+ buf.append(_state.toString()).append(' ');
String s = _options.getProperty("inbound.nickname");
if (s != null)
buf.append(s);
@@ -1262,7 +1263,6 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
SessionId id = _sessionId;
if (id != null)
buf.append(" #").append(id.getSessionId());
- buf.append(' ').append(_state.toString());
buf.append("]: ");
return buf.toString();
}
diff --git a/core/java/src/net/i2p/util/PortMapper.java b/core/java/src/net/i2p/util/PortMapper.java
index b3c8e65e7..816020433 100644
--- a/core/java/src/net/i2p/util/PortMapper.java
+++ b/core/java/src/net/i2p/util/PortMapper.java
@@ -2,6 +2,7 @@ package net.i2p.util;
import java.io.IOException;
import java.io.Writer;
+import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -16,7 +17,7 @@ import net.i2p.I2PAppContext;
* @since 0.8.12
*/
public class PortMapper {
- private final ConcurrentHashMap| " +
" " +
- "").append(app.name).append("" +
+ "").append(app.name).append("" +
" " +
" |
Port Mapper
| Service | Port\n");
+ out.write("Port Mapper
|
|---|