From d771745981acd58798841453035e4215f1e218af Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 24 Jul 2009 23:10:15 +0000 Subject: [PATCH] * Throttle: Decrease default max tunnels to 2500 --- history.txt | 5 +++++ router/java/src/net/i2p/router/Router.java | 9 ++++++++- router/java/src/net/i2p/router/RouterThrottleImpl.java | 2 +- router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/history.txt b/history.txt index 8926681975..59e76fec97 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +2009-07-24 zzz + * Eepsite: Add Deutsch index page and css (thanks sperrbezirk!) + * Router: Support i2p.dir.base and i2p.dir.config passed in via properties + * Throttle: Decrease default max tunnels to 2500 + 2009-07-23 dr|z3d * Include additional tile graphics and I2PSnark header logo in /console/images/ * Tidy up some layout irks; add some last minute 0.7.6 pre-release sparkle! diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 118d903b9d..c45dfb8ed1 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -125,7 +125,14 @@ public class Router { // we need the user directory figured out by now, so figure it out here rather than // in the RouterContext() constructor. // - // Fixme read config file before migration? or before? or both? + // We have not read the config file yet. Therefore the base and config locations + // are determined solely by properties (first envProps then System), for the purposes + // of initializing the user's config directory if it did not exist. + // If the base dir and/or config dir are set in the config file, + // they wil be used after the initialization of the (possibly different) dirs + // determined by WorkingDir. + // So for now, it doesn't make much sense to set the base or config dirs in the config file - + // use properties instead. If for some reason, distros need this, we can revisit it. // // Then add it to envProps (but not _config, we don't want it in the router.config file) // where it will then be available to all via _context.dir() diff --git a/router/java/src/net/i2p/router/RouterThrottleImpl.java b/router/java/src/net/i2p/router/RouterThrottleImpl.java index 88a8953321..228c216f1c 100644 --- a/router/java/src/net/i2p/router/RouterThrottleImpl.java +++ b/router/java/src/net/i2p/router/RouterThrottleImpl.java @@ -31,7 +31,7 @@ class RouterThrottleImpl implements RouterThrottle { private static int THROTTLE_EVENT_LIMIT = 30; private static final String PROP_MAX_TUNNELS = "router.maxParticipatingTunnels"; - private static final int DEFAULT_MAX_TUNNELS = 3000; + private static final int DEFAULT_MAX_TUNNELS = 2500; private static final String PROP_DEFAULT_KBPS_THROTTLE = "router.defaultKBpsThrottle"; private static final String PROP_MAX_PROCESSINGTIME = "router.defaultProcessingTimeThrottle"; private static final int DEFAULT_MAX_PROCESSINGTIME = 1500; diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index ff6552d4a1..b9e65a1095 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,9 +18,9 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 21-rc; + public final static long BUILD = 22; /** for example "-test" */ - public final static String EXTRA = ""; + public final static String EXTRA = "-rc"; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION);