From b2dcf2069f416ada0b01c96072cc88128c1bc343 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 21 Nov 2017 01:33:22 +0000
Subject: [PATCH] Transport: Add checks for more Tor ports as invalid

---
 router/java/src/net/i2p/router/transport/TransportUtil.java  | 4 ++++
 .../java/src/net/i2p/router/transport/udp/UDPEndpoint.java   | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/router/java/src/net/i2p/router/transport/TransportUtil.java b/router/java/src/net/i2p/router/transport/TransportUtil.java
index 2752e3fcc..2f9deeee8 100644
--- a/router/java/src/net/i2p/router/transport/TransportUtil.java
+++ b/router/java/src/net/i2p/router/transport/TransportUtil.java
@@ -241,7 +241,11 @@ public abstract class TransportUtil {
                port != 6697 &&  // IRC+TLS
                (!(port >= 7650 && port <= 7664)) && // standard I2P range
                port != 8998 &&  // mtn
+               port != 9001 &&  // Tor
+               port != 9030 &&  // Tor
+               port != 9050 &&  // Tor
                port != 9100 &&  // network printer
+               port != 9150 &&  // Tor browser
                // do not block anything in 9111 - 30777, this is the standard random selection range
                port != 31000 && // Wrapper
                port != 32000;   // Wrapper
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java
index d229c0611..07f303601 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPEndpoint.java
@@ -100,7 +100,8 @@ class UDPEndpoint implements SocketListener {
     /** 8998 is monotone, and 31000 is the wrapper outbound, so let's stay between those */
     public static final String PROP_MIN_PORT = "i2np.udp.minPort";
     public static final String PROP_MAX_PORT = "i2np.udp.maxPort";
-    private static final int MIN_RANDOM_PORT = 9111;
+    /** Was 9111, increase to skip Tor browser at 9050 */
+    private static final int MIN_RANDOM_PORT = 9151;
     private static final int MAX_RANDOM_PORT = 30777;
     private static final int MAX_PORT_RETRIES = 20;
 
@@ -116,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, 9100, 31000, 32000, 65536+");
+            _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+");
             port = -1;
         }