* Lower max netdb RI expiration again

* Increase default max tunnels
  * Cleanups after review
  * Exorcism (ticket #476)
This commit is contained in:
zzz
2011-10-10 19:22:03 +00:00
parent c884cfe6f6
commit f39e201067
12 changed files with 28 additions and 12 deletions

View File

@ -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 = 2500;
private static final int DEFAULT_MAX_TUNNELS = 3500;
private static final String PROP_DEFAULT_KBPS_THROTTLE = "router.defaultKBpsThrottle";
private static final String PROP_MAX_PROCESSINGTIME = "router.defaultProcessingTimeThrottle";

View File

@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 30;
public final static long BUILD = 0;
/** for example "-test" */
public final static String EXTRA = "-rc";
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);

View File

@ -206,10 +206,9 @@ public class StatisticsManager implements Service {
}
long numPeriods = rate.getLifetimePeriods();
if (fudgeQuantity) {
buf.append("666").append(';');
buf.append("555;");
if (numPeriods > 0) {
buf.append("666").append(';');
buf.append("666").append(';');
buf.append("555;555;");
}
} else {
buf.append(num(rate.getLastEventCount())).append(';');

View File

@ -121,7 +121,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
* limits for accepting a dbDtore of a router (unless we dont
* know anyone or just started up) -- see validate() below
*/
private final static long ROUTER_INFO_EXPIRATION = 2*24*60*60*1000l;
private final static long ROUTER_INFO_EXPIRATION = 36*60*60*1000l;
private final static long ROUTER_INFO_EXPIRATION_MIN = 90*60*1000l;
private final static long ROUTER_INFO_EXPIRATION_SHORT = 75*60*1000l;
private final static long ROUTER_INFO_EXPIRATION_FLOODFILL = 60*60*1000l;