From e0e09bfa45df100f1c82d07968bb106fe06148a5 Mon Sep 17 00:00:00 2001 From: jrandom Date: Fri, 26 Nov 2004 15:15:16 +0000 Subject: [PATCH] (please wait until the release announcement before updating) * 2004-11-26 0.4.2 released 2004-11-26 jrandom * Enable the new streaming lib as the default. That means, for any substantial definition, it is NOT BACKWARDS COMPATIBLE. --- .../net/i2p/client/streaming/I2PSocketManagerFactory.java | 6 +++--- core/java/src/net/i2p/CoreVersion.java | 4 ++-- router/java/src/net/i2p/router/RouterVersion.java | 6 +++--- .../net/i2p/router/message/OutboundClientMessageJob.java | 2 +- .../src/net/i2p/router/tunnelmanager/TestTunnelJob.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java index 2300189c1..e6238d28f 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java @@ -26,8 +26,8 @@ public class I2PSocketManagerFactory { private final static Log _log = new Log(I2PSocketManagerFactory.class); public static final String PROP_MANAGER = "i2p.streaming.manager"; - public static final String DEFAULT_MANAGER = "net.i2p.client.streaming.I2PSocketManagerImpl"; - //public static final String DEFAULT_MANAGER = "net.i2p.client.streaming.I2PSocketManagerFull"; + //public static final String DEFAULT_MANAGER = "net.i2p.client.streaming.I2PSocketManagerImpl"; + public static final String DEFAULT_MANAGER = "net.i2p.client.streaming.I2PSocketManagerFull"; /** * Create a socket manager using a brand new destination connected to the @@ -90,7 +90,7 @@ public class I2PSocketManagerFactory { opts.setProperty(name, System.getProperty(name)); } boolean oldLib = DEFAULT_MANAGER.equals(opts.getProperty(PROP_MANAGER, DEFAULT_MANAGER)); - if (oldLib) { + if (oldLib && false) { // for the old streaming lib opts.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_GUARANTEED); //opts.setProperty("tunnels.depthInbound", "0"); diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 092f0a14b..589449000 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,8 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.24 $ $Date: 2004/10/18 14:08:00 $"; - public final static String VERSION = "0.4.1.4"; + public final static String ID = "$Revision: 1.25 $ $Date: 2004/11/06 22:00:57 $"; + public final static String VERSION = "0.4.2"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a1ca39a35..f016d833b 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/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.86 $ $Date: 2004/11/22 20:12:34 $"; - public final static String VERSION = "0.4.1.4"; - public final static long BUILD = 15; + public final static String ID = "$Revision: 1.87 $ $Date: 2004/11/25 16:57:20 $"; + public final static String VERSION = "0.4.2"; + public final static long BUILD = 0; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION); System.out.println("Router ID: " + RouterVersion.ID); diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageJob.java index 9051f1388..7f2bd2041 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageJob.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageJob.java @@ -63,7 +63,7 @@ public class OutboundClientMessageJob extends JobImpl { private final static long OVERALL_TIMEOUT_MS_DEFAULT = 60*1000; /** how long for each send do we allow before going on to the next? */ - private final static long DEFAULT_SEND_PARTIAL_TIMEOUT = 10*1000; + private final static long DEFAULT_SEND_PARTIAL_TIMEOUT = 50*1000; private static final String PROP_SEND_PARTIAL_TIMEOUT = "router.clientPartialSendTimeout"; /** priority of messages, that might get honored some day... */ diff --git a/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java b/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java index 599d6e913..b220cafae 100644 --- a/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java +++ b/router/java/src/net/i2p/router/tunnelmanager/TestTunnelJob.java @@ -74,7 +74,7 @@ class TestTunnelJob extends JobImpl { } private final static long DEFAULT_TEST_TIMEOUT = 10*1000; // 10 seconds for a test to succeed - private final static long DEFAULT_MINIMUM_TEST_TIMEOUT = 5*1000; // 5 second min + private final static long DEFAULT_MINIMUM_TEST_TIMEOUT = 10*1000; // 5 second min private final static long MAXIMUM_TEST_TIMEOUT = 60*1000; // 60 second max private final static int TEST_PRIORITY = 100;