From 892ef4abe12425d482d9b21ff0932d8ed35e1f15 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 19 Oct 2011 02:33:45 +0000
Subject: [PATCH] reduce RI expiration again

---
 history.txt                                                   | 3 +++
 router/java/src/net/i2p/router/RouterVersion.java             | 4 ++--
 .../networkdb/kademlia/KademliaNetworkDatabaseFacade.java     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/history.txt b/history.txt
index e3e36cf37..8065cd8f8 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+* 2011-10-19 zzz
+  * NetDB: Reduce RI max expiration again
+
 * 2011-10-18 zzz
   * StoreJob: Ensure nonzero token
   * Tunnels: Connection limit mitigation:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0725033fa..f6ba057e6 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -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 = 3;
+    public final static long BUILD = 4;
 
     /** 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);
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index c1a769dc9..9c86b7f01 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -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 = 36*60*60*1000l;
+    private final static long ROUTER_INFO_EXPIRATION = 27*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;