Changeset c3181d85 for router

Timestamp:

Nov 10, 2016 3:09:39 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

aeeee0e

Parents:

24ecc85

Message:

Transport: Use NTCP for some outbound connections even before
SSU minimums are met (ticket #1835)

Location:

router/java/src/net/i2p/router

Files:

• RouterVersion.java (modified) (1 diff)
• transport/udp/UDPTransport.java (modified) (1 diff)

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     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" */

router/java/src/net/i2p/router/transport/udp/UDPTransport.java

@@ -1770 +1770 @@
             // never get any introducers)
             int count = _peersByIdent.size();
-            if (alwaysPreferUDP() || count < _min_peers ||
-                (_haveIPv6Address && count < _min_v6_peers) ||
-                (introducersRequired() && _introManager.introducerCount() < MIN_INTRODUCER_POOL))
+            if (alwaysPreferUDP()) {
                 return _cachedBid[SLOW_PREFERRED_BID];
-            else if (preferUDP())
+            } else if (count < _min_peers ||
+                       (_haveIPv6Address && count < _min_v6_peers) ||
+                       (introducersRequired() && _introManager.introducerCount() < MIN_INTRODUCER_POOL)) {
+                 // Even if we haven't hit our minimums, give NTCP a chance some of the time.
+                 // This may make things work a little faster at startup
+                 // (especially when we have an IPv6 address and the increased minimums),
+                 // and if UDP is completely blocked we'll still have some connectivity.
+                 // TODO After some time, decide that UDP is blocked/broken and return TRANSIENT_FAIL_BID?
+                if (_context.random().nextInt(4) == 0)
+                    return _cachedBid[SLOWEST_BID];
+                else
+                    return _cachedBid[SLOW_PREFERRED_BID];
+            } else if (preferUDP()) {
                 return _cachedBid[SLOW_BID];
-            else if (haveCapacity()) {
+            } else if (haveCapacity()) {
                 if (addr.getCost() > DEFAULT_COST)
                     return _cachedBid[SLOWEST_COST_BID];