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

Console: Redirect to HTTPS if available (ticket #2160)

Browse Source 
Show console links as HTTPS if available
Extend blacklisted ports to cover HTTPS console and eepsite
This commit is contained in:
zzz
2018-02-20 20:19:34 +00:00
parent 33ea4cf571
commit f00bf7d2cb
6 changed files with 120 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -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 = 7;
public final static long BUILD = 8;
/** for example "-test" */
public final static String EXTRA = "";

2
router/java/src/net/i2p/router/transport/TransportUtil.java
View File

@ -239,7 +239,7 @@ public abstract class TransportUtil {
port != 6000 && // lockd
(!(port >= 6665 && port <= 6669)) && // IRC and alternates
port != 6697 && // IRC+TLS
(!(port >= 7650 && port <= 7664)) && // standard I2P range
(!(port >= 7650 && port <= 7668)) && // standard I2P range
port != 8998 && // mtn
port != 9001 && // Tor
port != 9030 && // Tor

2
router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java
View File

@ -117,7 +117,7 @@ class UDPEndpoint implements SocketListener {
if (port > 0 && !TransportUtil.isValidPort(port)) {
_log.error("Specified UDP port " + port + " is not valid, selecting a new port");
// See isValidPort() for list
_log.error("Invalid ports are: 0-1023, 1900, 2049, 2827, 3659, 4045, 4444, 4445, 6000, 6665-6669, 6697, 7650-7664, 8998, 9001, 9030, 9050, 9100, 9150, 31000, 32000, 65536+");
_log.error("Invalid ports are: 0-1023, 1900, 2049, 2827, 3659, 4045, 4444, 4445, 6000, 6665-6669, 6697, 7650-7668, 8998, 9001, 9030, 9050, 9100, 9150, 31000, 32000, 65536+");
port = -1;
}