2007-07-01 zzz

* Replace broken option i2np.udp.alwaysPreferred with
      i2np.udp.preferred and adjust UDP bids; possible settings are
      "false" (default), "true", and "always".
      Default setting results in same behavior as before
      (NTCP is preferred unless it isn't established and UDP is established).
      Use to compare NTCP and UDP transports.

history.txt

@@ -1,4 +1,12 @@
-$Id: history.txt,v 1.569 2007-06-16 18:15:49 complication Exp $
+$Id: history.txt,v 1.570 2007-06-27 20:51:16 jrandom Exp $
+
+2007-07-01  zzz
+    * Replace broken option i2np.udp.alwaysPreferred with
+      i2np.udp.preferred and adjust UDP bids; possible settings are
+      "false" (default), "true", and "always".
+      Default setting results in same behavior as before
+      (NTCP is preferred unless it isn't established and UDP is established).
+      Use to compare NTCP and UDP transports.
 
 2007-06-27  jrandom
     * fix for a streaming lib bug that could leave a thread waiting

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

@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.504 $ $Date: 2007-06-16 18:15:51 $";
+    public final static String ID = "$Revision: 1.505 $ $Date: 2007-06-27 20:51:18 $";
     public final static String VERSION = "0.6.1.28";
-    public final static long BUILD = 7;
+    public final static long BUILD = 8;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);

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

@@ -73,9 +73,13 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     
     /** shared fast bid for connected peers */
     private TransportBid _fastBid;
-    /** shared slow bid for unconnected peers */
-    private TransportBid _slowBid;
     /** shared slow bid for unconnected peers when we want to prefer UDP */
+    private TransportBid _slowBid;
+    /** shared slow bid for unconnected peers */
+    private TransportBid _slowestBid;
+    /** shared fast bid for unconnected peers when we want to prefer UDP */
+    private TransportBid _fastPreferredBid;
+    /** shared slow bid for unconnected peers when we want to always prefer UDP */
     private TransportBid _slowPreferredBid;
     
     /** list of RemoteHostId for peers whose packets we want to drop outright */
@@ -92,14 +96,17 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     /** define this to explicitly set an external port */
     public static final String PROP_EXTERNAL_PORT = "i2np.udp.port";
     /** 
-     * If i2np.udp.alwaysPreferred is set, the UDP bids will always be under 
+     * If i2np.udp.preferred is set to "always", the UDP bids will always be under 
      * the bid from the TCP transport - even if a TCP connection already 
-     * exists.  If this is true (the default), it will always prefer UDP, otherwise
+     * exists.  If it is set to "true",
      * it will prefer UDP unless no UDP session exists and a TCP connection 
      * already exists.
+     * If it is set to "false" (the default),
+     * it will prefer TCP unless no TCP session exists and a UDP connection 
+     * already exists.
      */
-    public static final String PROP_ALWAYS_PREFER_UDP = "i2np.udp.alwaysPreferred";
+    public static final String PROP_PREFER_UDP = "i2np.udp.preferred";
-    private static final String DEFAULT_ALWAYS_PREFER_UDP = "true";
+    private static final String DEFAULT_PREFER_UDP = "false";
     
     public static final String PROP_FIXED_PORT = "i2np.udp.fixedPort";
     private static final String DEFAULT_FIXED_PORT = "true";
@@ -139,8 +146,10 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         _activeThrottle = mq;
 
         _fastBid = new SharedBid(50);
-        _slowBid = new SharedBid(1000);
+        _slowBid = new SharedBid(65);
-        _slowPreferredBid = new SharedBid(75);
+        _fastPreferredBid = new SharedBid(15);
+        _slowPreferredBid = new SharedBid(20);
+        _slowestBid = new SharedBid(1000);
         
         _fragments = new OutboundMessageFragments(_context, this, _activeThrottle);
         _inboundFragments = new InboundMessageFragments(_context, _fragments, this);
@@ -843,6 +852,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         if (peer != null) {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("bidding on a message to an established peer: " + peer);
+            if (preferUDP())
+                return _fastPreferredBid;
+            else
                 return _fastBid;
         } else {
             if (null == toAddress.getTargetAddress(STYLE))
@@ -852,14 +864,21 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 _log.debug("bidding on a message to an unestablished peer: " + to.toBase64());
             if (alwaysPreferUDP())
                 return _slowPreferredBid;
-            else
+            else if (preferUDP())
                 return _slowBid;
+            else
+                return _slowestBid;
         }
     }
 
+    private boolean preferUDP() {
+        String pref = _context.getProperty(PROP_PREFER_UDP, DEFAULT_PREFER_UDP);
+        return (pref != null) && ! "false".equals(pref);
+    }
+    
     private boolean alwaysPreferUDP() {
-        String pref = _context.getProperty(PROP_ALWAYS_PREFER_UDP, DEFAULT_ALWAYS_PREFER_UDP);
+        String pref = _context.getProperty(PROP_PREFER_UDP, DEFAULT_PREFER_UDP);
-        return (pref != null) && "true".equals(pref);
+        return (pref != null) && "always".equals(pref);
     }
     
     private static final int MAX_IDLE_TIME = 5*60*1000;