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

Util: Consolidate console URL generation in PortMapper

Browse Source
This commit is contained in:
zzz
2018-01-18 13:25:21 +00:00
parent 109ac5b61c
commit ae505995ac
7 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/src/net/i2p/util/PortMapper.java
View File

@@ -173,6 +173,24 @@ public class PortMapper {
return rv;
}
/*
* @return http URL unless console is https only. Default http://127.0.0.1:7657/
* @since 0.9.33 consolidated from i2ptunnel and desktopgui
*/
public String getConsoleURL() {
String unset = "*unset*";
String httpHost = getActualHost(SVC_CONSOLE, unset);
String httpsHost = getActualHost(SVC_HTTPS_CONSOLE, unset);
int httpPort = getPort(SVC_CONSOLE, 7657);
int httpsPort = getPort(SVC_HTTPS_CONSOLE, -1);
boolean httpsOnly = httpsPort > 0 && httpHost.equals(unset) && !httpsHost.equals(unset);
if (httpsOnly)
return "https://" + httpsHost + ':' + httpsPort + '/';
if (httpHost.equals(unset))
httpHost = "127.0.0.1";
return "http://" + httpHost + ':' + httpPort + '/';
}
/**
* For debugging only
* @since 0.9.20