From d4152ea5469f23e59f8f63190851ce63b2ba6839 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Thu, 5 Nov 2020 18:47:49 +0000 Subject: [PATCH] NetDB: Ensure RI republish time is less than validation time to prevent failures on connections esp. for hidden mode --- .../src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java | 2 +- .../networkdb/kademlia/KademliaNetworkDatabaseFacade.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java index 0c94cf8ef4..bebd33424f 100644 --- a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java +++ b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java @@ -46,7 +46,7 @@ public class PublishLocalRouterInfoJob extends JobImpl { * floodfills since we store directly. * Too long and the floodfill will drop us - timeout is 60 minutes. */ - private static final long PUBLISH_DELAY = 52*60*1000; + private static final long PUBLISH_DELAY = 43*60*1000; /** this needs to be long enough to give us time to start up, * but less than 20m (when we start accepting tunnels and could be a IBGW) 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 460b557260..bfc596cd25 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -140,7 +140,7 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad 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; - private final static long ROUTER_INFO_EXPIRATION_INTRODUCED = 45*60*1000l; + private final static long ROUTER_INFO_EXPIRATION_INTRODUCED = 54*60*1000l; /** * Don't let leaseSets go too far into the future -- GitLab