diff --git a/history.txt b/history.txt index 3a847093e..4124e4196 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,8 @@ -$Id: history.txt,v 1.408 2006/02/20 00:08:59 dust Exp $ +$Id: history.txt,v 1.409 2006/02/20 09:27:38 jrandom Exp $ + +2006-02-20 jrandom + * Reenable the TCP transport as a fallback (we'll continue to muck with + debugging SSU-only elsewhere) 2006-02-20 jrandom * Major SSU and router tuning to reduce contention, memory usage, and GC diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 86df1eab4..5b65a02d8 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.350 $ $Date: 2006/02/19 07:29:59 $"; + public final static String ID = "$Revision: 1.351 $ $Date: 2006/02/20 09:19:58 $"; public final static String VERSION = "0.6.1.10"; - public final static long BUILD = 6; + public final static long BUILD = 7; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID); diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java index 9c35655a8..779631753 100644 --- a/router/java/src/net/i2p/router/transport/TransportManager.java +++ b/router/java/src/net/i2p/router/transport/TransportManager.java @@ -56,9 +56,11 @@ public class TransportManager implements TransportEventListener { transport.setListener(null); } + private static final boolean ALLOW_TCP = true; + private void configTransports() { String disableTCP = _context.router().getConfigSetting(PROP_DISABLE_TCP); - if ( true || (disableTCP == null) || (Boolean.TRUE.toString().equalsIgnoreCase(disableTCP)) ) { + if ( !ALLOW_TCP || (disableTCP == null) || (Boolean.TRUE.toString().equalsIgnoreCase(disableTCP)) ) { _log.info("Explicitly disabling the TCP transport!"); } else { Transport t = new TCPTransport(_context); diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java b/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java index 7bf39523f..381e4a469 100644 --- a/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java +++ b/router/java/src/net/i2p/router/transport/tcp/TCPTransport.java @@ -89,7 +89,7 @@ public class TCPTransport extends TransportImpl { public static final int DEFAULT_ESTABLISHERS = 3; /** Ordered list of supported I2NP protocols */ - public static final int[] SUPPORTED_PROTOCOLS = new int[] { 5 }; // drop < 0.6 + public static final int[] SUPPORTED_PROTOCOLS = new int[] { 6 }; // drop < 0.6.1.11 /** blah, people shouldnt use defaults... */ public static final int DEFAULT_LISTEN_PORT = 8887;